diff options
-rw-r--r-- | ChangeLog | 3 | ||||
-rw-r--r-- | auth.c | 4 |
2 files changed, 3 insertions, 4 deletions
@@ -5,6 +5,7 @@ | |||
5 | passwords. Patch from dtucker@zip.com.au | 5 | passwords. Patch from dtucker@zip.com.au |
6 | - (djm) Bug #26: Use local mkstemp() rather than glibc's silly one. Fixes | 6 | - (djm) Bug #26: Use local mkstemp() rather than glibc's silly one. Fixes |
7 | Can't pass KRB4 TGT passing. Fix from: jan.iven@cern.ch | 7 | Can't pass KRB4 TGT passing. Fix from: jan.iven@cern.ch |
8 | - (djm) Fix Bug #442 for PAM case | ||
8 | 9 | ||
9 | 20030103 | 10 | 20030103 |
10 | - (djm) Bug #461: ssh-copy-id fails with no arguments. Patch from | 11 | - (djm) Bug #461: ssh-copy-id fails with no arguments. Patch from |
@@ -933,4 +934,4 @@ | |||
933 | save auth method before monitor_reset_key_state(); bugzilla bug #284; | 934 | save auth method before monitor_reset_key_state(); bugzilla bug #284; |
934 | ok provos@ | 935 | ok provos@ |
935 | 936 | ||
936 | $Id: ChangeLog,v 1.2543 2003/01/07 04:18:32 djm Exp $ | 937 | $Id: ChangeLog,v 1.2544 2003/01/07 05:15:20 djm Exp $ |
@@ -119,13 +119,11 @@ allowed_user(struct passwd * pw) | |||
119 | return 0; | 119 | return 0; |
120 | } | 120 | } |
121 | } | 121 | } |
122 | #endif | ||
123 | |||
124 | #if defined(HAVE_SHADOW_H) && !defined(DISABLE_SHADOW) | ||
125 | passwd = spw->sp_pwdp; | 122 | passwd = spw->sp_pwdp; |
126 | #else | 123 | #else |
127 | passwd = pw->pw_passwd; | 124 | passwd = pw->pw_passwd; |
128 | #endif | 125 | #endif |
126 | |||
129 | /* check for locked account */ | 127 | /* check for locked account */ |
130 | if (strcmp(passwd, "*LK*") == 0 || passwd[0] == '!') { | 128 | if (strcmp(passwd, "*LK*") == 0 || passwd[0] == '!') { |
131 | log("User %.100s not allowed because account is locked", | 129 | log("User %.100s not allowed because account is locked", |