- (dtucker) [auth-pam.c] Don't try to export PAM when compiled with

   -DUSE_POSIX_THREADS.  From antoine.verheijen at ualbert ca.  ok djm@

2 files changed, 8 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index fe08ea28b..e69642a6b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+20040304
+ - (dtucker) [auth-pam.c] Don't try to export PAM when compiled with
+   -DUSE_POSIX_THREADS.  From antoine.verheijen at ualbert ca.  ok djm@
+
 20040303
  - (djm) [configure.ac ssh-agent.c] Use prctl to prevent ptrace on ssh-agent
    ok dtucker  
@@ -845,4 +849,4 @@
    - (djm) Trim deprecated options from INSTALL. Mention UsePAM
    - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
 
-$Id: ChangeLog,v 1.3273 2004/03/04 08:47:29 dtucker Exp $
+$Id: ChangeLog,v 1.3274 2004/03/04 08:54:10 dtucker Exp $
diff --git a/auth-pam.c b/auth-pam.c
index 397f7d3a8..53221a02e 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.95 2004/02/17 12:20:08 dtucker Exp $");
+RCSID("$Id: auth-pam.c,v 1.96 2004/03/04 08:54:10 dtucker Exp $");
 
 #ifdef USE_PAM
 #if defined(HAVE_SECURITY_PAM_APPL_H)
@@ -201,6 +201,7 @@ import_environments(Buffer *b)
 
         debug3("PAM: %s entering", __func__);
 
+#ifndef USE_POSIX_THREADS
         /* Import variables set by do_pam_account */
         sshpam_account_status = buffer_get_int(b);
         pam_password_change_required(buffer_get_int(b));
@@ -228,6 +229,7 @@ import_environments(Buffer *b)
                 }
 #endif
         }
+#endif
 }
 
 /*