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 /auth2-pubkey.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 'auth2-pubkey.c')
-rw-r--r-- | auth2-pubkey.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/auth2-pubkey.c b/auth2-pubkey.c index d51e939f1..c28571ab6 100644 --- a/auth2-pubkey.c +++ b/auth2-pubkey.c | |||
@@ -23,7 +23,7 @@ | |||
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include "includes.h" | 25 | #include "includes.h" |
26 | RCSID("$OpenBSD: auth2-pubkey.c,v 1.4 2003/06/24 08:23:46 markus Exp $"); | 26 | RCSID("$OpenBSD: auth2-pubkey.c,v 1.5 2003/11/04 08:54:09 djm Exp $"); |
27 | 27 | ||
28 | #include "ssh2.h" | 28 | #include "ssh2.h" |
29 | #include "xmalloc.h" | 29 | #include "xmalloc.h" |
@@ -175,9 +175,6 @@ user_key_allowed2(struct passwd *pw, Key *key, char *file) | |||
175 | Key *found; | 175 | Key *found; |
176 | char *fp; | 176 | char *fp; |
177 | 177 | ||
178 | if (pw == NULL) | ||
179 | return 0; | ||
180 | |||
181 | /* Temporarily use the user's uid. */ | 178 | /* Temporarily use the user's uid. */ |
182 | temporarily_use_uid(pw); | 179 | temporarily_use_uid(pw); |
183 | 180 | ||