diff options
-rw-r--r-- | ChangeLog | 7 | ||||
-rw-r--r-- | auth-passwd.c | 4 |
2 files changed, 9 insertions, 2 deletions
@@ -1,6 +1,11 @@ | |||
1 | 20050726 | 1 | 20050726 |
2 | - (dtucker) [configure.ac] Update zlib warning message too, pointed out by | 2 | - (dtucker) [configure.ac] Update zlib warning message too, pointed out by |
3 | tim@. | 3 | tim@. |
4 | - (djm) OpenBSD CVS Sync | ||
5 | - otto@cvs.openbsd.org 2005/07/19 15:32:26 | ||
6 | [auth-passwd.c] | ||
7 | auth_usercheck(3) can return NULL, so check for that. Report from | ||
8 | mpech@. ok markus@ | ||
4 | 9 | ||
5 | 20050725 | 10 | 20050725 |
6 | - (dtucker) [configure.ac] Update zlib version check for CAN-2005-2096. | 11 | - (dtucker) [configure.ac] Update zlib version check for CAN-2005-2096. |
@@ -2865,4 +2870,4 @@ | |||
2865 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM | 2870 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM |
2866 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu | 2871 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu |
2867 | 2872 | ||
2868 | $Id: ChangeLog,v 1.3855 2005/07/26 02:00:42 dtucker Exp $ | 2873 | $Id: ChangeLog,v 1.3856 2005/07/26 11:54:11 djm Exp $ |
diff --git a/auth-passwd.c b/auth-passwd.c index 654e0b821..6e6d0d76a 100644 --- a/auth-passwd.c +++ b/auth-passwd.c | |||
@@ -36,7 +36,7 @@ | |||
36 | */ | 36 | */ |
37 | 37 | ||
38 | #include "includes.h" | 38 | #include "includes.h" |
39 | RCSID("$OpenBSD: auth-passwd.c,v 1.33 2005/01/24 11:47:13 dtucker Exp $"); | 39 | RCSID("$OpenBSD: auth-passwd.c,v 1.34 2005/07/19 15:32:26 otto Exp $"); |
40 | 40 | ||
41 | #include "packet.h" | 41 | #include "packet.h" |
42 | #include "buffer.h" | 42 | #include "buffer.h" |
@@ -163,6 +163,8 @@ sys_auth_passwd(Authctxt *authctxt, const char *password) | |||
163 | 163 | ||
164 | as = auth_usercheck(pw->pw_name, authctxt->style, "auth-ssh", | 164 | as = auth_usercheck(pw->pw_name, authctxt->style, "auth-ssh", |
165 | (char *)password); | 165 | (char *)password); |
166 | if (as == NULL) | ||
167 | return (0); | ||
166 | if (auth_getstate(as) & AUTH_PWEXPIRED) { | 168 | if (auth_getstate(as) & AUTH_PWEXPIRED) { |
167 | auth_close(as); | 169 | auth_close(as); |
168 | disable_forwarding(); | 170 | disable_forwarding(); |