- (djm) Fix Bug #442 for PAM case

diff --git a/ChangeLog b/ChangeLog
index 681c51f1b1f21b3f00e87424c7e3919c99c0867d..28c3400321775e293dc96a4451c6e6f1b1cb6383 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,7 @@
    passwords. Patch from dtucker@zip.com.au
  - (djm) Bug #26: Use local mkstemp() rather than glibc's silly one. Fixes
    Can't pass KRB4 TGT passing. Fix from: jan.iven@cern.ch
+ - (djm) Fix Bug #442 for PAM case
 
 20030103
  - (djm) Bug #461: ssh-copy-id fails with no arguments. Patch from 
@@ -933,4 +934,4 @@
      save auth method before monitor_reset_key_state(); bugzilla bug #284;
      ok provos@
 
-$Id: ChangeLog,v 1.2543 2003/01/07 04:18:32 djm Exp $
+$Id: ChangeLog,v 1.2544 2003/01/07 05:15:20 djm Exp $

diff --git a/auth.c b/auth.c
index 0e7910943ee1da117a5bae8896c7c62467e72447..ee21149dfa6747e6ddcbf5161b8dee20fab8b8f1 100644 (file)
--- a/auth.c
+++ b/auth.c
@@ -119,13 +119,11 @@ allowed_user(struct passwd * pw)
                        return 0;
                }
        }
-#endif
-
-#if defined(HAVE_SHADOW_H) && !defined(DISABLE_SHADOW)
        passwd = spw->sp_pwdp;
 #else
        passwd = pw->pw_passwd;
 #endif
+
        /* check for locked account */
        if (strcmp(passwd, "*LK*") == 0 || passwd[0] == '!') {
                log("User %.100s not allowed because account is locked",