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

[openssh.git] / auth2.c

diff --git a/auth2.c b/auth2.c
index ca052664975bf8fbbf6720f547263d294ed6d69f..a52c9e2899d96d0105acfa63a38935556533c50e 100644 (file)
--- 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.69 2001/07/23 18:14:58 stevesk Exp $");
 
 #include <openssl/evp.h>
 
@@ -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;
@@ -679,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();
@@ -721,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;
                }