[src/trunk]: src/crypto/external/bsd/openssh/dist PR/51973: Use proper fd for...

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/b9d6e94061da
branches:  trunk
changeset: 821760:b9d6e94061da
user:      christos <christos%NetBSD.org@localhost>
date:      Thu Feb 16 17:56:07 2017 +0000

description:
PR/51973: Use proper fd for AuthorizedKeysCommand

diffstat:

 crypto/external/bsd/openssh/dist/auth2-pubkey.c |  11 ++---------
 1 files changed, 2 insertions(+), 9 deletions(-)

diffs (32 lines):

diff -r 253b8814c28c -r b9d6e94061da crypto/external/bsd/openssh/dist/auth2-pubkey.c
--- a/crypto/external/bsd/openssh/dist/auth2-pubkey.c   Thu Feb 16 17:15:26 2017 +0000
+++ b/crypto/external/bsd/openssh/dist/auth2-pubkey.c   Thu Feb 16 17:56:07 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: auth2-pubkey.c,v 1.15 2016/12/25 00:07:46 christos Exp $       */
+/*     $NetBSD: auth2-pubkey.c,v 1.16 2017/02/16 17:56:07 christos Exp $       */
 /* $OpenBSD: auth2-pubkey.c,v 1.60 2016/11/30 02:57:40 djm Exp $ */
 
 /*
@@ -26,7 +26,7 @@
  */
 
 #include "includes.h"
-__RCSID("$NetBSD: auth2-pubkey.c,v 1.15 2016/12/25 00:07:46 christos Exp $");
+__RCSID("$NetBSD: auth2-pubkey.c,v 1.16 2017/02/16 17:56:07 christos Exp $");
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/wait.h>
@@ -839,13 +839,6 @@
            }
        }
 #endif
-       debug("trying public key file %s", file);
-       f = auth_openkeyfile(file, pw, options.strict_modes);
-
-       if (!f) {
-               restore_uid();
-               return 0;
-       }
 
        found_key = 0;