- (djm) Add back radix.o (used by AFS support), after it went missing from

   Makefile many moons ago
 - (djm) Apply "owl-always-auth" patch from Openwall/Solar Designer
 - (djm) Fix blibpath specification for AIX/gcc
 - (djm) Some systems have basename in -lgen. Fix from ayamura@ayamura.org

1 files changed, 7 insertions, 7 deletions

diff --git a/auth-pam.c b/auth-pam.c
index b29444e89..f3d1956ea 100644
--- a/auth-pam.c
+++ b/auth-pam.c
@@ -38,7 +38,7 @@ extern char *__progname;
 
 extern int use_privsep;
 
-RCSID("$Id: auth-pam.c,v 1.56 2003/04/09 10:59:48 djm Exp $");
+RCSID("$Id: auth-pam.c,v 1.57 2003/04/29 13:22:40 djm Exp $");
 
 #define NEW_AUTHTOK_MSG \
         "Warning: Your password has expired, please change it now."
@@ -201,7 +201,7 @@ void do_pam_cleanup_proc(void *context)
         }
 }
 
-/* Attempt password authentation using PAM */
+/* Attempt password authentication using PAM */
 int auth_pam_password(Authctxt *authctxt, const char *password)
 {
         extern ServerOptions options;
@@ -215,13 +215,13 @@ int auth_pam_password(Authctxt *authctxt, const char *password)
         pamstate = INITIAL_LOGIN;
         pam_retval = do_pam_authenticate(
             options.permit_empty_passwd == 0 ? PAM_DISALLOW_NULL_AUTHTOK : 0);
-        if (pam_retval == PAM_SUCCESS) {
-                debug("PAM Password authentication accepted for "
-                    "user \"%.100s\"", pw->pw_name);
+        if (pam_retval == PAM_SUCCESS && pw) {
+                debug("PAM password authentication accepted for "
+                    "%.100s", pw->pw_name);
                 return 1;
         } else {
-                debug("PAM Password authentication for \"%.100s\" "
-                    "failed[%d]: %s", pw->pw_name, pam_retval, 
+                debug("PAM password authentication failed for "
+                    "%.100s: %s", pw ? pw->pw_name : "an illegal user",
                     PAM_STRERROR(__pamh, pam_retval));
                 return 0;
         }