diff options
author | Colin Watson <cjwatson@debian.org> | 2005-05-30 22:13:03 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2005-05-30 22:13:03 +0000 |
commit | 4e1e258d1f5745f3dc05ead3cb834c445e6e8818 (patch) | |
tree | bfbc91107d6bfe7b2a68d8701562e59856116a6a /ssh-add.c | |
parent | 4a20a0b23bd0e1db5e69f27c65aaa11a5a2eacd0 (diff) | |
parent | a55bd782aa819b7f5ae716de000f19f4f531850e (diff) |
Merge 4.1p1 to the trunk.
Diffstat (limited to 'ssh-add.c')
-rw-r--r-- | ssh-add.c | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -35,7 +35,7 @@ | |||
35 | */ | 35 | */ |
36 | 36 | ||
37 | #include "includes.h" | 37 | #include "includes.h" |
38 | RCSID("$OpenBSD: ssh-add.c,v 1.70 2004/05/08 00:21:31 djm Exp $"); | 38 | RCSID("$OpenBSD: ssh-add.c,v 1.71 2005/03/10 22:01:06 deraadt Exp $"); |
39 | 39 | ||
40 | #include <openssl/evp.h> | 40 | #include <openssl/evp.h> |
41 | 41 | ||
@@ -389,7 +389,7 @@ main(int argc, char **argv) | |||
389 | goto done; | 389 | goto done; |
390 | } | 390 | } |
391 | 391 | ||
392 | for(i = 0; default_files[i]; i++) { | 392 | for (i = 0; default_files[i]; i++) { |
393 | snprintf(buf, sizeof(buf), "%s/%s", pw->pw_dir, | 393 | snprintf(buf, sizeof(buf), "%s/%s", pw->pw_dir, |
394 | default_files[i]); | 394 | default_files[i]); |
395 | if (stat(buf, &st) < 0) | 395 | if (stat(buf, &st) < 0) |
@@ -402,7 +402,7 @@ main(int argc, char **argv) | |||
402 | if (count == 0) | 402 | if (count == 0) |
403 | ret = 1; | 403 | ret = 1; |
404 | } else { | 404 | } else { |
405 | for(i = 0; i < argc; i++) { | 405 | for (i = 0; i < argc; i++) { |
406 | if (do_file(ac, deleting, argv[i]) == -1) | 406 | if (do_file(ac, deleting, argv[i]) == -1) |
407 | ret = 1; | 407 | ret = 1; |
408 | } | 408 | } |