diff options
| author | Darren Tucker <dtucker@zip.com.au> | 2004-01-13 12:35:58 +0100 |
|---|---|---|
| committer | Darren Tucker <dtucker@zip.com.au> | 2004-01-13 12:35:58 +0100 |
| commit | 1b27c8fbcb8f59559bc3bcf4d9d6f739305b4ee8 (patch) | |
| tree | 8d1de25ad52f826585f8a1bfa9e656155d7fb02d | |
| parent | - (dtucker) [configure.ac] Remove extra (typo) comma. (diff) | |
| download | openssh-1b27c8fbcb8f59559bc3bcf4d9d6f739305b4ee8.tar.xz openssh-1b27c8fbcb8f59559bc3bcf4d9d6f739305b4ee8.zip | |
- (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.
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | auth-pam.c | 27 |
2 files changed, 20 insertions, 13 deletions
@@ -1,3 +1,7 @@ +20040113 + - (dtucker) [auth-pam.c] Relocate struct pam_ctxt and prototypes. No + functional changes. + 20040108 - (dtucker) [auth-pam.c defines.h] Bug #783: move __unused to defines.h and only define if not already. From des at freebsd.org. @@ -1655,4 +1659,4 @@ - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. Report from murple@murple.net, diagnosis from dtucker@zip.com.au -$Id: ChangeLog,v 1.3165 2004/01/08 13:19:25 dtucker Exp $ +$Id: ChangeLog,v 1.3166 2004/01/13 11:35:58 dtucker Exp $ diff --git a/auth-pam.c b/auth-pam.c index 5c77edb66..fe2ae7711 100644 --- a/auth-pam.c +++ b/auth-pam.c @@ -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 ** |