- djm@cvs.openbsd.org 2010/01/30 02:54:53

[openssh.git] / auth2-pubkey.c

diff --git a/auth2-pubkey.c b/auth2-pubkey.c
index 7f7ddd8cf9f81c1978a701b56aab0603c473004b..2886f1275f025f17e2424c8252bd2c201bf28f73 100644 (file)
--- a/auth2-pubkey.c
+++ b/auth2-pubkey.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: auth2-pubkey.c,v 1.16 2008/06/13 04:40:22 djm Exp $ */
+/* $OpenBSD: auth2-pubkey.c,v 1.19 2008/07/03 21:46:58 otto Exp $ */
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
  *
@@ -32,6 +32,7 @@
 #include <pwd.h>
 #include <stdio.h>
 #include <stdarg.h>
+#include <unistd.h>
 
 #include "xmalloc.h"
 #include "ssh.h"
@@ -169,10 +170,6 @@ done:
                key_free(key);
        xfree(pkalg);
        xfree(pkblob);
-#ifdef HAVE_CYGWIN
-       if (check_nt_auth(0, authctxt->pw) == 0)
-               authenticated = 0;
-#endif
        return authenticated;
 }
 
@@ -181,10 +178,9 @@ static int
 user_key_allowed2(struct passwd *pw, Key *key, char *file)
 {
        char line[SSH_MAX_PUBKEY_BYTES];
-       int found_key = 0, fd;
+       int found_key = 0;
        FILE *f;
        u_long linenum = 0;
-       struct stat st;
        Key *found;
        char *fp;
 
@@ -192,37 +188,9 @@ user_key_allowed2(struct passwd *pw, Key *key, char *file)
        temporarily_use_uid(pw);
 
        debug("trying public key file %s", file);
+       f = auth_openkeyfile(file, pw, options.strict_modes);
 
-       /*
-        * Open the file containing the authorized keys
-        * Fail quietly if file does not exist
-        */
-       if ((fd = open(file, O_RDONLY|O_NONBLOCK)) == -1) {
-               restore_uid();
-               return 0;
-       }
-       if (fstat(fd, &st) < 0) {
-               close(fd);
-               restore_uid();
-               return 0;
-       }
-       if (!S_ISREG(st.st_mode)) {
-               logit("User %s authorized keys %s is not a regular file",
-                   pw->pw_name, file);
-               close(fd);
-               restore_uid();
-               return 0;
-       }
-       unset_nonblock(fd);
-       if ((f = fdopen(fd, "r")) == NULL) {
-               close(fd);
-               restore_uid();
-               return 0;
-       }
-       if (options.strict_modes &&
-           secure_filename(f, file, pw, line, sizeof(line)) != 0) {
-               fclose(f);
-               logit("Authentication refused: %s", line);
+       if (!f) {
                restore_uid();
                return 0;
        }