diff options
-rw-r--r-- | ChangeLog | 7 | ||||
-rw-r--r-- | auth2.c | 6 | ||||
-rw-r--r-- | sshconnect2.c | 7 |
3 files changed, 12 insertions, 8 deletions
@@ -12,7 +12,10 @@ | |||
12 | - provos@cvs.openbsd.org 2001/06/25 17:54:47 | 12 | - provos@cvs.openbsd.org 2001/06/25 17:54:47 |
13 | [auth.c auth.h auth-rsa.c] | 13 | [auth.c auth.h auth-rsa.c] |
14 | terminate secure_filename checking after checking homedir. that way | 14 | terminate secure_filename checking after checking homedir. that way |
15 | it | 15 | it works on AFS. okay markus@ |
16 | - stevesk@cvs.openbsd.org 2001/06/25 20:26:37 | ||
17 | [auth2.c sshconnect2.c] | ||
18 | prototype cleanup; ok markus@ | ||
16 | 19 | ||
17 | 20010629 | 20 | 20010629 |
18 | - (bal) Removed net_aton() since we don't use it any more | 21 | - (bal) Removed net_aton() since we don't use it any more |
@@ -5840,4 +5843,4 @@ | |||
5840 | - Wrote replacements for strlcpy and mkdtemp | 5843 | - Wrote replacements for strlcpy and mkdtemp |
5841 | - Released 1.0pre1 | 5844 | - Released 1.0pre1 |
5842 | 5845 | ||
5843 | $Id: ChangeLog,v 1.1347 2001/07/04 03:40:39 mouring Exp $ | 5846 | $Id: ChangeLog,v 1.1348 2001/07/04 03:42:30 mouring Exp $ |
@@ -23,7 +23,7 @@ | |||
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include "includes.h" | 25 | #include "includes.h" |
26 | RCSID("$OpenBSD: auth2.c,v 1.66 2001/06/23 15:12:17 itojun Exp $"); | 26 | RCSID("$OpenBSD: auth2.c,v 1.67 2001/06/25 20:26:37 stevesk Exp $"); |
27 | 27 | ||
28 | #include <openssl/evp.h> | 28 | #include <openssl/evp.h> |
29 | 29 | ||
@@ -80,7 +80,7 @@ static void protocol_error(int, int, void *); | |||
80 | 80 | ||
81 | /* helper */ | 81 | /* helper */ |
82 | static Authmethod *authmethod_lookup(const char *); | 82 | static Authmethod *authmethod_lookup(const char *); |
83 | char *authmethods_get(void); | 83 | static char *authmethods_get(void); |
84 | static int user_key_allowed(struct passwd *, Key *); | 84 | static int user_key_allowed(struct passwd *, Key *); |
85 | static int hostbased_key_allowed(struct passwd *, const char *, char *, Key *); | 85 | static int hostbased_key_allowed(struct passwd *, const char *, char *, Key *); |
86 | 86 | ||
@@ -600,7 +600,7 @@ auth_get_user(void) | |||
600 | 600 | ||
601 | #define DELIM "," | 601 | #define DELIM "," |
602 | 602 | ||
603 | char * | 603 | static char * |
604 | authmethods_get(void) | 604 | authmethods_get(void) |
605 | { | 605 | { |
606 | Authmethod *method = NULL; | 606 | Authmethod *method = NULL; |
diff --git a/sshconnect2.c b/sshconnect2.c index 4ce8d4d85..258ee4834 100644 --- a/sshconnect2.c +++ b/sshconnect2.c | |||
@@ -23,7 +23,7 @@ | |||
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include "includes.h" | 25 | #include "includes.h" |
26 | RCSID("$OpenBSD: sshconnect2.c,v 1.78 2001/06/24 05:47:13 markus Exp $"); | 26 | RCSID("$OpenBSD: sshconnect2.c,v 1.79 2001/06/25 20:26:37 stevesk Exp $"); |
27 | 27 | ||
28 | #include <openssl/bn.h> | 28 | #include <openssl/bn.h> |
29 | #include <openssl/md5.h> | 29 | #include <openssl/md5.h> |
@@ -461,7 +461,7 @@ userauth_passwd(Authctxt *authctxt) | |||
461 | return 1; | 461 | return 1; |
462 | } | 462 | } |
463 | 463 | ||
464 | void | 464 | static void |
465 | clear_auth_state(Authctxt *authctxt) | 465 | clear_auth_state(Authctxt *authctxt) |
466 | { | 466 | { |
467 | /* XXX clear authentication state */ | 467 | /* XXX clear authentication state */ |
@@ -976,7 +976,8 @@ authmethod_get(char *authlist) | |||
976 | 976 | ||
977 | 977 | ||
978 | #define DELIM "," | 978 | #define DELIM "," |
979 | char * | 979 | |
980 | static char * | ||
980 | authmethods_get(void) | 981 | authmethods_get(void) |
981 | { | 982 | { |
982 | Authmethod *method = NULL; | 983 | Authmethod *method = NULL; |