- (dtucker) [auth.c] Do not check for locked accounts when PAM is enabled.

diff --git a/ChangeLog b/ChangeLog
index 8e439f82e6e797ff2ac05e252de204ede23a6aba..a743402dcc6adeb44d8dbeb59dbf9a62b819ad08 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -35,6 +35,7 @@
  - (dtucker) [Makefile.in] Remove auth2-krb5.
  - (dtucker) [contrib/aix/inventory.sh] Add public domain notice.  ok mouring@
    (the original author)
+ - (dtucker) [auth.c] Do not check for locked accounts when PAM is enabled.
 
 20030825
  - (djm) Bug #621: Select OpenSC keys by usage attributes. Patch from 

diff --git a/auth.c b/auth.c
index 9a59e27070e0326ed45f7262306f9456e51ac4c0..f645cc1122aededf7e52e75a42eaf49b4843c20c 100644 (file)
--- a/auth.c
+++ b/auth.c
@@ -73,7 +73,7 @@ int
 allowed_user(struct passwd * pw)
 {
        struct stat st;
-       const char *hostname = NULL, *ipaddr = NULL, *passwd;
+       const char *hostname = NULL, *ipaddr = NULL, *passwd = NULL;
        char *shell;
        int i;
 #if defined(HAVE_SHADOW_H) && !defined(DISABLE_SHADOW)
@@ -131,7 +131,7 @@ allowed_user(struct passwd * pw)
 #endif
 
        /* check for locked account */ 
-       if (passwd && *passwd) {
+       if (!options.use_pam && passwd && *passwd) {
                int locked = 0;
 
 #ifdef LOCKED_PASSWD_STRING