Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

PR/51973: Use proper fd for AuthorizedKeysCommand

Browse Source
This commit is contained in:
christos 2017-02-16 17:56:07 +00:00
parent aaf544539d
commit 0ac6b0daad
1 changed files with 2 additions and 9 deletions

11
crypto/external/bsd/openssh/dist/auth2-pubkey.c vendored

@ -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 $ */ /* $OpenBSD: auth2-pubkey.c,v 1.60 2016/11/30 02:57:40 djm Exp $ */
/* /*
@ -26,7 +26,7 @@
*/ */
#include "includes.h" #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/types.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <sys/wait.h> #include <sys/wait.h>
@ -839,13 +839,6 @@ check_authkeys_file(FILE *f, char *file, Key* key, struct passwd *pw)
} }
} }
#endif #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; found_key = 0;