diff options
author | Damien Miller <djm@mindrot.org> | 2003-01-07 16:15:20 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2003-01-07 16:15:20 +1100 |
commit | 64004b5566282ceb395674e0c4aaa89e04b3847d (patch) | |
tree | 4f77531d6dd1805d834f5489ede3e6c989273313 | |
parent | e832819cf7289b467070fc31c5080c133f0a101e (diff) |
- (djm) Fix Bug #442 for PAM case
-rw-r--r-- | ChangeLog | 3 | ||||
-rw-r--r-- | auth.c | 4 |
2 files changed, 3 insertions, 4 deletions
@@ -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 $ @@ -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", |