diff --git a/ChangeLog b/ChangeLog index a9cf6dbc0..5507cab0d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -12,7 +12,10 @@ - provos@cvs.openbsd.org 2001/06/25 17:54:47 [auth.c auth.h auth-rsa.c] terminate secure_filename checking after checking homedir. that way - it + it works on AFS. okay markus@ + - stevesk@cvs.openbsd.org 2001/06/25 20:26:37 + [auth2.c sshconnect2.c] + prototype cleanup; ok markus@ 20010629 - (bal) Removed net_aton() since we don't use it any more @@ -5840,4 +5843,4 @@ - Wrote replacements for strlcpy and mkdtemp - Released 1.0pre1 -$Id: ChangeLog,v 1.1347 2001/07/04 03:40:39 mouring Exp $ +$Id: ChangeLog,v 1.1348 2001/07/04 03:42:30 mouring Exp $ diff --git a/auth2.c b/auth2.c index ca0526649..e7a7050f4 100644 --- a/auth2.c +++ b/auth2.c @@ -23,7 +23,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: auth2.c,v 1.66 2001/06/23 15:12:17 itojun Exp $"); +RCSID("$OpenBSD: auth2.c,v 1.67 2001/06/25 20:26:37 stevesk Exp $"); #include @@ -80,7 +80,7 @@ static void protocol_error(int, int, void *); /* helper */ static Authmethod *authmethod_lookup(const char *); -char *authmethods_get(void); +static char *authmethods_get(void); static int user_key_allowed(struct passwd *, Key *); static int hostbased_key_allowed(struct passwd *, const char *, char *, Key *); @@ -600,7 +600,7 @@ auth_get_user(void) #define DELIM "," -char * +static char * authmethods_get(void) { 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 @@ */ #include "includes.h" -RCSID("$OpenBSD: sshconnect2.c,v 1.78 2001/06/24 05:47:13 markus Exp $"); +RCSID("$OpenBSD: sshconnect2.c,v 1.79 2001/06/25 20:26:37 stevesk Exp $"); #include #include @@ -461,7 +461,7 @@ userauth_passwd(Authctxt *authctxt) return 1; } -void +static void clear_auth_state(Authctxt *authctxt) { /* XXX clear authentication state */ @@ -976,7 +976,8 @@ authmethod_get(char *authlist) #define DELIM "," -char * + +static char * authmethods_get(void) { Authmethod *method = NULL;