diff options
| author | des <des@FreeBSD.org> | 2016-01-19 18:55:44 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2016-01-19 18:55:44 +0000 |
| commit | b856a4573162fbc9ddf1c38fd82b6c728c310d1b (patch) | |
| tree | b2a4ad7a06e845ba72a87d2beedfbbcbb7aeb5bb /crypto/openssh/authfile.c | |
| parent | 76107b08804f309434efce7480edc2bbd15e1bf7 (diff) | |
| parent | f8195792ec11c7b20879183ea72e1495f0870617 (diff) | |
| download | FreeBSD-src-b856a4573162fbc9ddf1c38fd82b6c728c310d1b.zip FreeBSD-src-b856a4573162fbc9ddf1c38fd82b6c728c310d1b.tar.gz | |
Upgrade to OpenSSH 6.9p1.
Diffstat (limited to 'crypto/openssh/authfile.c')
| -rw-r--r-- | crypto/openssh/authfile.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/crypto/openssh/authfile.c b/crypto/openssh/authfile.c index 3a81786..728b136 100644 --- a/crypto/openssh/authfile.c +++ b/crypto/openssh/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 */ |
