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 /ssh-add.c | |
parent | 306d118f72670f0da447f28b7eec576dcb4a6e38 (diff) | |
download | openssh-git-8275fade44b56aed722ea91bc4586f48babece80.tar.gz |
- 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 'ssh-add.c')
-rw-r--r-- | ssh-add.c | 17 |
1 files changed, 13 insertions, 4 deletions
@@ -35,7 +35,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: ssh-add.c,v 1.75 2006/02/20 17:19:54 stevesk Exp $"); +RCSID("$OpenBSD: ssh-add.c,v 1.76 2006/03/13 10:26:52 dtucker Exp $"); #include <sys/types.h> #include <sys/stat.h> @@ -127,16 +127,25 @@ delete_all(AuthenticationConnection *ac) static int add_file(AuthenticationConnection *ac, const char *filename) { - struct stat st; Key *private; char *comment = NULL; char msg[1024]; - int ret = -1; + int fd, perms_ok, ret = -1; - if (stat(filename, &st) < 0) { + if ((fd = open(filename, 0)) < 0) { perror(filename); return -1; } + + /* + * Since we'll try to load a keyfile multiple times, permission errors + * will occur multiple times, so check perms first and bail if wrong. + */ + perms_ok = key_perm_ok(fd, filename); + close(fd); + if (!perms_ok) + return -1; + /* At first, try empty passphrase */ private = key_load_private(filename, "", &comment); if (comment == NULL) |