- jakob@cvs.openbsd.org 2001/08/02 16:14:05

[openssh.git] / auth2.c

diff --git a/auth2.c b/auth2.c
index 3d2dcdc6c5d3bd4da9e9a29ce3f273fa62981870..a52c9e2899d96d0105acfa63a38935556533c50e 100644 (file)
--- a/auth2.c
+++ b/auth2.c
@@ -23,7 +23,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: auth2.c,v 1.64 2001/06/23 00:20:58 markus Exp $");
+RCSID("$OpenBSD: auth2.c,v 1.69 2001/07/23 18:14:58 stevesk Exp $");
 
 #include <openssl/evp.h>
 
@@ -74,25 +74,23 @@ struct Authmethod {
 
 /* protocol */
 
-void   input_service_request(int type, int plen, void *ctxt);
-void   input_userauth_request(int type, int plen, void *ctxt);
-void   protocol_error(int type, int plen, void *ctxt);
+static void input_service_request(int, int, void *);
+static void input_userauth_request(int, int, void *);
+static void protocol_error(int, int, void *);
 
 /* helper */
-Authmethod     *authmethod_lookup(const char *name);
-char   *authmethods_get(void);
-int    user_key_allowed(struct passwd *pw, Key *key);
-int
-hostbased_key_allowed(struct passwd *pw, const char *cuser, char *chost,
-    Key *key);
+static Authmethod *authmethod_lookup(const char *);
+static char *authmethods_get(void);
+static int user_key_allowed(struct passwd *, Key *);
+static int hostbased_key_allowed(struct passwd *, const char *, char *, Key *);
 
 /* auth */
-void   userauth_banner(void);
-int    userauth_none(Authctxt *authctxt);
-int    userauth_passwd(Authctxt *authctxt);
-int    userauth_pubkey(Authctxt *authctxt);
-int    userauth_hostbased(Authctxt *authctxt);
-int    userauth_kbdint(Authctxt *authctxt);
+static void userauth_banner(void);
+static int userauth_none(Authctxt *);
+static int userauth_passwd(Authctxt *);
+static int userauth_pubkey(Authctxt *);
+static int userauth_hostbased(Authctxt *);
+static int userauth_kbdint(Authctxt *);
 
 Authmethod authmethods[] = {
        {"none",
@@ -136,7 +134,7 @@ do_authentication2()
        do_authenticated(authctxt);
 }
 
-void
+static void
 protocol_error(int type, int plen, void *ctxt)
 {
        log("auth: protocol error: type %d plen %d", type, plen);
@@ -146,7 +144,7 @@ protocol_error(int type, int plen, void *ctxt)
        packet_write_wait();
 }
 
-void
+static void
 input_service_request(int type, int plen, void *ctxt)
 {
        Authctxt *authctxt = ctxt;
@@ -179,7 +177,7 @@ input_service_request(int type, int plen, void *ctxt)
        xfree(service);
 }
 
-void
+static void
 input_userauth_request(int type, int plen, void *ctxt)
 {
        Authctxt *authctxt = ctxt;
@@ -297,7 +295,7 @@ userauth_finish(Authctxt *authctxt, int authenticated, char *method)
        }
 }
 
-void
+static void
 userauth_banner(void)
 {
        struct stat st;
@@ -328,7 +326,7 @@ done:
        return;
 }
 
-int
+static int
 userauth_none(Authctxt *authctxt)
 {
        /* disable method "none", only allowed one time */
@@ -354,7 +352,7 @@ userauth_none(Authctxt *authctxt)
 #endif /* USE_PAM */
 }
 
-int
+static int
 userauth_passwd(Authctxt *authctxt)
 {
        char *password;
@@ -383,7 +381,7 @@ userauth_passwd(Authctxt *authctxt)
        return authenticated;
 }
 
-int
+static int
 userauth_kbdint(Authctxt *authctxt)
 {
        int authenticated = 0;
@@ -411,7 +409,7 @@ userauth_kbdint(Authctxt *authctxt)
        return authenticated;
 }
 
-int
+static int
 userauth_pubkey(Authctxt *authctxt)
 {
        Buffer b;
@@ -517,7 +515,7 @@ userauth_pubkey(Authctxt *authctxt)
        return authenticated;
 }
 
-int
+static int
 userauth_hostbased(Authctxt *authctxt)
 {
        Buffer b;
@@ -602,7 +600,7 @@ auth_get_user(void)
 
 #define        DELIM   ","
 
-char *
+static char *
 authmethods_get(void)
 {
        Authmethod *method = NULL;
@@ -634,7 +632,7 @@ authmethods_get(void)
        return list;
 }
 
-Authmethod *
+static Authmethod *
 authmethod_lookup(const char *name)
 {
        Authmethod *method = NULL;
@@ -649,7 +647,7 @@ authmethod_lookup(const char *name)
 }
 
 /* return 1 if user allows given key */
-int
+static int
 user_key_allowed2(struct passwd *pw, Key *key, char *file)
 {
        char line[8192];
@@ -681,7 +679,7 @@ user_key_allowed2(struct passwd *pw, Key *key, char *file)
                return 0;
        }
        if (options.strict_modes &&
-           secure_filename(f, file, pw->pw_uid, line, sizeof(line)) != 0) {
+           secure_filename(f, file, pw, line, sizeof(line)) != 0) {
                fclose(f);
                log("Authentication refused: %s", line);
                restore_uid();
@@ -723,7 +721,7 @@ user_key_allowed2(struct passwd *pw, Key *key, char *file)
                if (key_equal(found, key) &&
                    auth_parse_options(pw, options, file, linenum) == 1) {
                        found_key = 1;
-                       debug("matching key found: file %s, line %ld",
+                       debug("matching key found: file %s, line %lu",
                            file, linenum);
                        break;
                }
@@ -737,7 +735,7 @@ user_key_allowed2(struct passwd *pw, Key *key, char *file)
 }
 
 /* check whether given key is in .ssh/authorized_keys* */
-int
+static int
 user_key_allowed(struct passwd *pw, Key *key)
 {
        int success;
@@ -757,7 +755,7 @@ user_key_allowed(struct passwd *pw, Key *key)
 }
 
 /* return 1 if given hostkey is allowed */
-int
+static int
 hostbased_key_allowed(struct passwd *pw, const char *cuser, char *chost,
     Key *key)
 {
@@ -791,14 +789,14 @@ hostbased_key_allowed(struct passwd *pw, const char *cuser, char *chost,
 
        host_status = check_key_in_hostfiles(pw, key, lookup,
            _PATH_SSH_SYSTEM_HOSTFILE,
-            options.ignore_user_known_hosts ? _PATH_SSH_USER_HOSTFILE : NULL);
+           options.ignore_user_known_hosts ? NULL : _PATH_SSH_USER_HOSTFILE);
 
        /* backward compat if no key has been found. */
        if (host_status == HOST_NEW)
                host_status = check_key_in_hostfiles(pw, key, lookup,
                    _PATH_SSH_SYSTEM_HOSTFILE2,
-                   options.ignore_user_known_hosts ? _PATH_SSH_USER_HOSTFILE2 :
-                   NULL);
+                   options.ignore_user_known_hosts ? NULL :
+                   _PATH_SSH_USER_HOSTFILE2);
 
        return (host_status == HOST_OK);
 }