diff options
author | Colin Watson <cjwatson@debian.org> | 2003-09-23 18:08:35 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2003-09-23 18:08:35 +0000 |
commit | d59fd3e421aa81b8e5e118f3f806081df2aca879 (patch) | |
tree | 356a4e607edc979c625bb33db63c656d771478bd /auth2-pubkey.c | |
parent | 7505658c58e96b8d270f1928a0e1fa7f3e0c266b (diff) | |
parent | 45431c9b4677608680cd071768cbf156b316a7e8 (diff) |
Merge 3.7.1p2 to the trunk. I have absolutely no idea yet whether this will
work.
Diffstat (limited to 'auth2-pubkey.c')
-rw-r--r-- | auth2-pubkey.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/auth2-pubkey.c b/auth2-pubkey.c index 947bfed0b..d51e939f1 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.2 2002/05/31 11:35:15 markus Exp $"); | 26 | RCSID("$OpenBSD: auth2-pubkey.c,v 1.4 2003/06/24 08:23:46 markus Exp $"); |
27 | 27 | ||
28 | #include "ssh2.h" | 28 | #include "ssh2.h" |
29 | #include "xmalloc.h" | 29 | #include "xmalloc.h" |
@@ -44,7 +44,7 @@ RCSID("$OpenBSD: auth2-pubkey.c,v 1.2 2002/05/31 11:35:15 markus Exp $"); | |||
44 | /* import */ | 44 | /* import */ |
45 | extern ServerOptions options; | 45 | extern ServerOptions options; |
46 | extern u_char *session_id2; | 46 | extern u_char *session_id2; |
47 | extern int session_id2_len; | 47 | extern u_int session_id2_len; |
48 | 48 | ||
49 | static int | 49 | static int |
50 | userauth_pubkey(Authctxt *authctxt) | 50 | userauth_pubkey(Authctxt *authctxt) |
@@ -78,7 +78,7 @@ userauth_pubkey(Authctxt *authctxt) | |||
78 | pktype = key_type_from_name(pkalg); | 78 | pktype = key_type_from_name(pkalg); |
79 | if (pktype == KEY_UNSPEC) { | 79 | if (pktype == KEY_UNSPEC) { |
80 | /* this is perfectly legal */ | 80 | /* this is perfectly legal */ |
81 | log("userauth_pubkey: unsupported public key algorithm: %s", | 81 | logit("userauth_pubkey: unsupported public key algorithm: %s", |
82 | pkalg); | 82 | pkalg); |
83 | goto done; | 83 | goto done; |
84 | } | 84 | } |
@@ -199,7 +199,7 @@ user_key_allowed2(struct passwd *pw, Key *key, char *file) | |||
199 | if (options.strict_modes && | 199 | if (options.strict_modes && |
200 | secure_filename(f, file, pw, line, sizeof(line)) != 0) { | 200 | secure_filename(f, file, pw, line, sizeof(line)) != 0) { |
201 | fclose(f); | 201 | fclose(f); |
202 | log("Authentication refused: %s", line); | 202 | logit("Authentication refused: %s", line); |
203 | restore_uid(); | 203 | restore_uid(); |
204 | return 0; | 204 | return 0; |
205 | } | 205 | } |