diff options
author | Damien Miller <djm@mindrot.org> | 2005-07-26 21:54:11 +1000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2005-07-26 21:54:11 +1000 |
commit | 47655ee03a67ed89ef55c957e5a8183ca3113d2c (patch) | |
tree | 57fc9eb96fca562cbf76ff5384963257abf33a8c /auth-passwd.c | |
parent | ac1910f1a523b8e5d4c6a764a419244a91e5f390 (diff) |
- (djm) OpenBSD CVS Sync
- otto@cvs.openbsd.org 2005/07/19 15:32:26
[auth-passwd.c]
auth_usercheck(3) can return NULL, so check for that. Report from
mpech@. ok markus@
Diffstat (limited to 'auth-passwd.c')
-rw-r--r-- | auth-passwd.c | 4 |
1 files changed, 3 insertions, 1 deletions
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(); |