From e47e681f295ae98eefffebb5d1283d18c250fe3f Mon Sep 17 00:00:00 2001
From: dtucker <dtucker>
Date: Tue, 13 Jan 2004 11:35:58 +0000
Subject: [PATCH]  - (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.
---
 ChangeLog  |  4 ++++
 auth-pam.c | 25 ++++++++++++++-----------
 2 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 1970c2d2..58ad89c3 100644
--- 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 583ee668..80e00c3b 100644
--- 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 **
-- 
2.45.2