- (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.

diff --git a/ChangeLog b/ChangeLog
index 1970c2d2f70eb8bc61baf77dd2be298c702b200b..58ad89c3b156b7725b1f78a827d660382d0e544e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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.

diff --git a/auth-pam.c b/auth-pam.c
index 583ee668eeda4bb4e7558f41c36d8108a1552882..80e00c3b08947a997b6ce342a876979c7365bab5 100644 (file)
--- a/auth-pam.c
+++ b/auth-pam.c
@@ -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 **