diff options
author | Damien Miller <djm@mindrot.org> | 2006-03-15 12:06:23 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2006-03-15 12:06:23 +1100 |
commit | 8275fade44b56aed722ea91bc4586f48babece80 (patch) | |
tree | 008fc19e661c19854303ee25c8e5d12347546893 /authfile.c | |
parent | 306d118f72670f0da447f28b7eec576dcb4a6e38 (diff) |
- dtucker@cvs.openbsd.org 2006/03/13 10:26:52
[authfile.c authfile.h ssh-add.c]
Make ssh-add check file permissions before attempting to load private
key files multiple times; it will fail anyway and this prevents confusing
multiple prompts and warnings. mindrot #1138, ok djm@
Diffstat (limited to 'authfile.c')
-rw-r--r-- | authfile.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/authfile.c b/authfile.c index f97cf1820..0656262d0 100644 --- a/authfile.c +++ b/authfile.c | |||
@@ -36,7 +36,7 @@ | |||
36 | */ | 36 | */ |
37 | 37 | ||
38 | #include "includes.h" | 38 | #include "includes.h" |
39 | RCSID("$OpenBSD: authfile.c,v 1.62 2006/02/20 17:19:54 stevesk Exp $"); | 39 | RCSID("$OpenBSD: authfile.c,v 1.63 2006/03/13 10:26:52 dtucker Exp $"); |
40 | 40 | ||
41 | #include <sys/types.h> | 41 | #include <sys/types.h> |
42 | #include <sys/stat.h> | 42 | #include <sys/stat.h> |
@@ -510,7 +510,7 @@ key_load_private_pem(int fd, int type, const char *passphrase, | |||
510 | return prv; | 510 | return prv; |
511 | } | 511 | } |
512 | 512 | ||
513 | static int | 513 | int |
514 | key_perm_ok(int fd, const char *filename) | 514 | key_perm_ok(int fd, const char *filename) |
515 | { | 515 | { |
516 | struct stat st; | 516 | struct stat st; |