- (djm) Fix Bug #442 for PAM case

diff --git a/ChangeLog b/ChangeLog
index 20e2fa3d9d030580f2a438bc4d3d6339a481e35a..7300a12ff65c7c268b68bc9d868b2830fad8ae1a 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 

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",