diff options
author | Darren Tucker <dtucker@zip.com.au> | 2004-01-13 22:35:58 +1100 |
---|---|---|
committer | Darren Tucker <dtucker@zip.com.au> | 2004-01-13 22:35:58 +1100 |
commit | 1b27c8fbcb8f59559bc3bcf4d9d6f739305b4ee8 (patch) | |
tree | 8d1de25ad52f826585f8a1bfa9e656155d7fb02d /auth-pam.c | |
parent | fd0894adae297f5ce1695d78b5738e21414d480c (diff) | |
download | openssh-git-1b27c8fbcb8f59559bc3bcf4d9d6f739305b4ee8.tar.gz |
- (dtucker) [auth-pam.c] Relocate struct pam_ctxt and prototypes. No
functional changes.
This is in preparation for a change to catch the authentication thread
exitting unexpectedly, to split functional and cosmetic changes.
Diffstat (limited to 'auth-pam.c')
-rw-r--r-- | auth-pam.c | 27 |
1 files changed, 15 insertions, 12 deletions
@@ -31,7 +31,7 @@ /* Based on $FreeBSD: src/crypto/openssh/auth2-pam-freebsd.c,v 1.11 2003/03/31 13:48:18 des Exp $ */ #include "includes.h" -RCSID("$Id: auth-pam.c,v 1.88 2004/01/08 12:32:04 dtucker Exp $"); +RCSID("$Id: auth-pam.c,v 1.89 2004/01/13 11:35:59 dtucker Exp $"); #ifdef USE_PAM #if defined(HAVE_SECURITY_PAM_APPL_H) @@ -68,10 +68,23 @@ extern int compat20; */ typedef pthread_t sp_pthread_t; #else +typedef pid_t sp_pthread_t; +#endif + +struct pam_ctxt { + sp_pthread_t pam_thread; + int pam_psock; + int pam_csock; + int pam_done; +}; + +static void sshpam_free_ctx(void *); +static struct pam_ctxt *cleanup_ctxt; + +#ifndef USE_POSIX_THREADS /* * Simulate threads with processes. */ -typedef pid_t sp_pthread_t; static void pthread_exit(void *value __unused) @@ -124,16 +137,6 @@ static int sshpam_cred_established = 0; static int sshpam_account_status = -1; static char **sshpam_env = NULL; -struct pam_ctxt { - sp_pthread_t pam_thread; - int pam_psock; - int pam_csock; - int pam_done; -}; - -static void sshpam_free_ctx(void *); -static struct pam_ctxt *cleanup_ctxt; - /* Some PAM implementations don't implement this */ #ifndef HAVE_PAM_GETENVLIST static char ** |