diff options
author | Damien Miller <djm@mindrot.org> | 2003-11-17 21:13:40 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2003-11-17 21:13:40 +1100 |
commit | 3e3b5145e59c78cbde0f31f59a9267867b8eea2f (patch) | |
tree | 6725a1cc2cd54237952d89e4811e1cb82cc46a5d /auth-passwd.c | |
parent | 8f746ec9703a0072c7a07a25e4c059f7533bf94b (diff) |
- djm@cvs.openbsd.org 2003/11/04 08:54:09
[auth1.c auth2.c auth2-pubkey.c auth.h auth-krb5.c auth-passwd.c]
[auth-rhosts.c auth-rh-rsa.c auth-rsa.c monitor.c serverloop.c]
[session.c]
standardise arguments to auth methods - they should all take authctxt.
check authctxt->valid rather then pw != NULL; ok markus@
Diffstat (limited to 'auth-passwd.c')
-rw-r--r-- | auth-passwd.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/auth-passwd.c b/auth-passwd.c index 971c7ba19..b7e275556 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.29 2003/08/26 09:58:43 markus Exp $"); | 39 | RCSID("$OpenBSD: auth-passwd.c,v 1.30 2003/11/04 08:54:09 djm Exp $"); |
40 | 40 | ||
41 | #include "packet.h" | 41 | #include "packet.h" |
42 | #include "log.h" | 42 | #include "log.h" |
@@ -60,11 +60,8 @@ auth_password(Authctxt *authctxt, const char *password) | |||
60 | struct passwd * pw = authctxt->pw; | 60 | struct passwd * pw = authctxt->pw; |
61 | int ok = authctxt->valid; | 61 | int ok = authctxt->valid; |
62 | 62 | ||
63 | /* deny if no user. */ | ||
64 | if (pw == NULL) | ||
65 | return 0; | ||
66 | #ifndef HAVE_CYGWIN | 63 | #ifndef HAVE_CYGWIN |
67 | if (pw && pw->pw_uid == 0 && options.permit_root_login != PERMIT_YES) | 64 | if (pw->pw_uid == 0 && options.permit_root_login != PERMIT_YES) |
68 | ok = 0; | 65 | ok = 0; |
69 | #endif | 66 | #endif |
70 | if (*password == '\0' && options.permit_empty_passwd == 0) | 67 | if (*password == '\0' && options.permit_empty_passwd == 0) |