1 files changed, 15 insertions, 10 deletions

diff --git a/auth-pam.c b/auth-pam.c
index d3186372e..36dbb7e15 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.100 2004/04/18 01:00:26 dtucker Exp $");
 
 #ifdef USE_PAM
 #if defined(HAVE_SECURITY_PAM_APPL_H)
@@ -58,6 +58,7 @@ RCSID("$Id: auth-pam.c,v 1.95 2004/02/17 12:20:08 dtucker Exp $");
 extern ServerOptions options;
 extern Buffer loginmsg;
 extern int compat20;
+extern u_int utmp_len;
 
 #ifdef USE_POSIX_THREADS
 #include <pthread.h>
@@ -160,7 +161,7 @@ static int sshpam_session_open = 0;
 static int sshpam_cred_established = 0;
 static int sshpam_account_status = -1;
 static char **sshpam_env = NULL;
-static Authctxt *the_authctxt = NULL;
+static Authctxt *sshpam_authctxt = NULL;
 
 /* Some PAM implementations don't implement this */
 #ifndef HAVE_PAM_GETENVLIST
@@ -180,9 +181,9 @@ void
 pam_password_change_required(int reqd)
 {
         debug3("%s %d", __func__, reqd);
-        if (the_authctxt == NULL)
+        if (sshpam_authctxt == NULL)
                 fatal("%s: PAM authctxt not initialized", __func__);
-        the_authctxt->force_pwchange = reqd;
+        sshpam_authctxt->force_pwchange = reqd;
         if (reqd) {
                 no_port_forwarding_flag |= 2;
                 no_agent_forwarding_flag |= 2;
@@ -204,6 +205,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));
@@ -231,6 +233,7 @@ import_environments(Buffer *b)
                 }
 #endif
         }
+#endif
 }
 
 /*
@@ -339,7 +342,7 @@ sshpam_thread(void *ctxtp)
         sshpam_conv.conv = sshpam_thread_conv;
         sshpam_conv.appdata_ptr = ctxt;
 
-        if (the_authctxt == NULL)
+        if (sshpam_authctxt == NULL)
                 fatal("%s: PAM authctxt not initialized", __func__);
 
         buffer_init(&buffer);
@@ -354,7 +357,7 @@ sshpam_thread(void *ctxtp)
         if (compat20) {
                 if (!do_pam_account())
                         goto auth_fail;
-                if (the_authctxt->force_pwchange) {
+                if (sshpam_authctxt->force_pwchange) {
                         sshpam_err = pam_chauthtok(sshpam_handle,
                             PAM_CHANGE_EXPIRED_AUTHTOK);
                         if (sshpam_err != PAM_SUCCESS)
@@ -368,7 +371,7 @@ sshpam_thread(void *ctxtp)
 #ifndef USE_POSIX_THREADS
         /* Export variables set by do_pam_account */
         buffer_put_int(&buffer, sshpam_account_status);
-        buffer_put_int(&buffer, the_authctxt->force_pwchange);
+        buffer_put_int(&buffer, sshpam_authctxt->force_pwchange);
 
         /* Export any environment strings set in child */
         for(i = 0; environ[i] != NULL; i++)
@@ -451,7 +454,6 @@ sshpam_cleanup(void)
 static int
 sshpam_init(Authctxt *authctxt)
 {
-        extern u_int utmp_len;
         extern char *__progname;
         const char *pam_rhost, *pam_user, *user = authctxt->user;
 
@@ -467,7 +469,7 @@ sshpam_init(Authctxt *authctxt)
         debug("PAM: initializing for \"%s\"", user);
         sshpam_err =
             pam_start(SSHD_PAM_SERVICE, user, &null_conv, &sshpam_handle);
-        the_authctxt = authctxt;
+        sshpam_authctxt = authctxt;
 
         if (sshpam_err != PAM_SUCCESS) {
                 pam_end(sshpam_handle, sshpam_err);
@@ -597,7 +599,10 @@ sshpam_query(void *ctx, char **name, char **info,
                                 xfree(msg);
                                 return (0);
                         }
-                        error("PAM: %s", msg);
+                        error("PAM: %s for %s%.100s from %.100s", msg,
+                            sshpam_authctxt->valid ? "" : "illegal user ",
+                            sshpam_authctxt->user,
+                            get_remote_name_or_ip(utmp_len, options.use_dns));
                         /* FALLTHROUGH */
                 default:
                         *num = 0;