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

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

diff --git a/ChangeLog b/ChangeLog
index 0f47b0b97ec58369aedf7dc15c8fed5b36451a35..9a4cab187eda2b53f1003fc6a4b942664953a28a 100644 (file)
--- 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  

diff --git a/auth-pam.c b/auth-pam.c
index 7157e726420a7bdedc72abfcf955bc8333926d80..4487d0678c13c3cec97019a0ad4ba11f99497c69 100644 (file)
--- a/auth-pam.c
+++ b/auth-pam.c
@@ -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
 }
 
 /*