diff options
| author | Dag-Erling Smørgrav <des@FreeBSD.org> | 2015-07-02 13:18:50 +0000 |
|---|---|---|
| committer | Dag-Erling Smørgrav <des@FreeBSD.org> | 2015-07-02 13:18:50 +0000 |
| commit | b5a1b3a82df411cb95b6a850e9d9d90bc3d082f9 (patch) | |
| tree | 2fc0f8c0c9b94a14bd7ce42838fc88997f4cd7b8 /authfile.c | |
| parent | c1e0861503468de5ae00ed0e532f349ec78bec68 (diff) | |
Vendor import of OpenSSH 6.9p1.vendor/openssh/6.9p1
Notes
svn path=/vendor-crypto/openssh/dist/; revision=285033
svn path=/vendor-crypto/openssh/6.9p1/; revision=285034; tag=vendor/openssh/6.9p1
Diffstat (limited to 'authfile.c')
| -rw-r--r-- | authfile.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/authfile.c b/authfile.c index 3a81786c7d2b..728b136a77bd 100644 --- a/authfile.c +++ b/authfile.c @@ -1,4 +1,4 @@ -/* $OpenBSD: authfile.c,v 1.111 2015/02/23 16:55:51 djm Exp $ */ +/* $OpenBSD: authfile.c,v 1.114 2015/04/17 13:32:09 djm Exp $ */ /* * Copyright (c) 2000, 2013 Markus Friedl. All rights reserved. * @@ -186,7 +186,7 @@ sshkey_perm_ok(int fd, const char *filename) error("@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"); error("Permissions 0%3.3o for '%s' are too open.", (u_int)st.st_mode & 0777, filename); - error("It is recommended that your private key files are NOT accessible by others."); + error("It is required that your private key files are NOT accessible by others."); error("This private key will be ignored."); return SSH_ERR_KEY_BAD_PERMISSIONS; } @@ -359,6 +359,8 @@ sshkey_load_public(const char *filename, struct sshkey **keyp, char **commentp) case 0: return r; } +#else /* WITH_SSH1 */ + close(fd); #endif /* WITH_SSH1 */ /* try ssh2 public key */ |