summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2002-01-22 23:07:01 +1100
committerDamien Miller <djm@mindrot.org>2002-01-22 23:07:01 +1100
commita055c25d059ddb2dcfd200ee18d4007f1c573984 (patch)
tree4a61c299380f5dd0baecb62e0569549f3f1e2f5c
parent7c31809c4ae41e03e0d393ee7f00667c6e728477 (diff)
- deraadt@cvs.openbsd.org 2001/12/24 07:29:43
[ssh-add.c] try all listed keys.. how did this get broken? (oops - that was me)
-rw-r--r--ChangeLog5
-rw-r--r--ssh-add.c4
2 files changed, 6 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 2bed33205..f874fc546 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -23,6 +23,9 @@
23 - markus@cvs.openbsd.org 2001/12/21 12:17:33 23 - markus@cvs.openbsd.org 2001/12/21 12:17:33
24 [serverloop.c] 24 [serverloop.c]
25 remove ifdef for USE_PIPES since fdin != fdout; ok djm@ 25 remove ifdef for USE_PIPES since fdin != fdout; ok djm@
26 - deraadt@cvs.openbsd.org 2001/12/24 07:29:43
27 [ssh-add.c]
28 try all listed keys.. how did this get broken?
26 29
2720020121 3020020121
28 - (djm) Rework ssh-rand-helper: 31 - (djm) Rework ssh-rand-helper:
@@ -7170,4 +7173,4 @@
7170 - Wrote replacements for strlcpy and mkdtemp 7173 - Wrote replacements for strlcpy and mkdtemp
7171 - Released 1.0pre1 7174 - Released 1.0pre1
7172 7175
7173$Id: ChangeLog,v 1.1728 2002/01/22 12:06:22 djm Exp $ 7176$Id: ChangeLog,v 1.1729 2002/01/22 12:07:01 djm Exp $
diff --git a/ssh-add.c b/ssh-add.c
index 4a2b65f54..6d79357cc 100644
--- a/ssh-add.c
+++ b/ssh-add.c
@@ -35,7 +35,7 @@
35 */ 35 */
36 36
37#include "includes.h" 37#include "includes.h"
38RCSID("$OpenBSD: ssh-add.c,v 1.48 2001/12/21 10:06:43 djm Exp $"); 38RCSID("$OpenBSD: ssh-add.c,v 1.49 2001/12/24 07:29:43 deraadt Exp $");
39 39
40#include <openssl/evp.h> 40#include <openssl/evp.h>
41 41
@@ -322,7 +322,7 @@ main(int argc, char **argv)
322 } 322 }
323 } else { 323 } else {
324 for(i = 0; i < argc; i++) { 324 for(i = 0; i < argc; i++) {
325 if (do_file(ac, deleting, argv[1]) == -1) 325 if (do_file(ac, deleting, argv[i]) == -1)
326 ret = 1; 326 ret = 1;
327 } 327 }
328 } 328 }