diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | auth-rsa.c | 8 |
2 files changed, 8 insertions, 5 deletions
@@ -22,6 +22,9 @@ | |||
22 | - stevesk@cvs.openbsd.org 2002/03/24 23:20:00 | 22 | - stevesk@cvs.openbsd.org 2002/03/24 23:20:00 |
23 | [monitor.c] | 23 | [monitor.c] |
24 | remove "\n" from fatal() | 24 | remove "\n" from fatal() |
25 | - markus@cvs.openbsd.org 2002/03/25 09:21:13 | ||
26 | [auth-rsa.c] | ||
27 | return 0 (not NULL); tomh@po.crl.go.jp | ||
25 | 28 | ||
26 | 20020324 | 29 | 20020324 |
27 | - (stevesk) [session.c] disable LOGIN_NEEDS_TERM until we are sure | 30 | - (stevesk) [session.c] disable LOGIN_NEEDS_TERM until we are sure |
@@ -8036,4 +8039,4 @@ | |||
8036 | - Wrote replacements for strlcpy and mkdtemp | 8039 | - Wrote replacements for strlcpy and mkdtemp |
8037 | - Released 1.0pre1 | 8040 | - Released 1.0pre1 |
8038 | 8041 | ||
8039 | $Id: ChangeLog,v 1.1984 2002/03/26 02:49:34 mouring Exp $ | 8042 | $Id: ChangeLog,v 1.1985 2002/03/26 02:59:31 mouring Exp $ |
diff --git a/auth-rsa.c b/auth-rsa.c index 9c5d484b1..c51400c2a 100644 --- a/auth-rsa.c +++ b/auth-rsa.c | |||
@@ -14,7 +14,7 @@ | |||
14 | */ | 14 | */ |
15 | 15 | ||
16 | #include "includes.h" | 16 | #include "includes.h" |
17 | RCSID("$OpenBSD: auth-rsa.c,v 1.52 2002/03/18 17:50:31 provos Exp $"); | 17 | RCSID("$OpenBSD: auth-rsa.c,v 1.53 2002/03/25 09:21:13 markus Exp $"); |
18 | 18 | ||
19 | #include <openssl/rsa.h> | 19 | #include <openssl/rsa.h> |
20 | #include <openssl/md5.h> | 20 | #include <openssl/md5.h> |
@@ -165,7 +165,7 @@ auth_rsa_key_allowed(struct passwd *pw, BIGNUM *client_n, Key **rkey) | |||
165 | /* Restore the privileged uid. */ | 165 | /* Restore the privileged uid. */ |
166 | restore_uid(); | 166 | restore_uid(); |
167 | xfree(file); | 167 | xfree(file); |
168 | return (NULL); | 168 | return (0); |
169 | } | 169 | } |
170 | /* Open the file containing the authorized keys. */ | 170 | /* Open the file containing the authorized keys. */ |
171 | f = fopen(file, "r"); | 171 | f = fopen(file, "r"); |
@@ -173,7 +173,7 @@ auth_rsa_key_allowed(struct passwd *pw, BIGNUM *client_n, Key **rkey) | |||
173 | /* Restore the privileged uid. */ | 173 | /* Restore the privileged uid. */ |
174 | restore_uid(); | 174 | restore_uid(); |
175 | xfree(file); | 175 | xfree(file); |
176 | return (NULL); | 176 | return (0); |
177 | } | 177 | } |
178 | if (options.strict_modes && | 178 | if (options.strict_modes && |
179 | secure_filename(f, file, pw, line, sizeof(line)) != 0) { | 179 | secure_filename(f, file, pw, line, sizeof(line)) != 0) { |
@@ -181,7 +181,7 @@ auth_rsa_key_allowed(struct passwd *pw, BIGNUM *client_n, Key **rkey) | |||
181 | fclose(f); | 181 | fclose(f); |
182 | log("Authentication refused: %s", line); | 182 | log("Authentication refused: %s", line); |
183 | restore_uid(); | 183 | restore_uid(); |
184 | return (NULL); | 184 | return (0); |
185 | } | 185 | } |
186 | 186 | ||
187 | /* Flag indicating whether the key is allowed. */ | 187 | /* Flag indicating whether the key is allowed. */ |