diff options
author | Colin Watson <cjwatson@debian.org> | 2006-05-12 08:53:37 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2006-05-12 08:53:37 +0000 |
commit | 2ee73b36b9a35daeaa4b065046882dc1f5f551b6 (patch) | |
tree | f64a4ace625514e94759878c0b94ab0a79805bbd /ssh-add.c | |
parent | 3c190ec8e469477ea65fbf4cc83062c65c281434 (diff) | |
parent | 3e2e0ac10674d77618c4c7339e18b83ced247492 (diff) |
Merge 4.3p2 to the trunk.
Diffstat (limited to 'ssh-add.c')
-rw-r--r-- | ssh-add.c | 8 |
1 files changed, 6 insertions, 2 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.72 2005/07/17 07:17:55 djm Exp $"); | 38 | RCSID("$OpenBSD: ssh-add.c,v 1.74 2005/11/12 18:37:59 deraadt Exp $"); |
39 | 39 | ||
40 | #include <openssl/evp.h> | 40 | #include <openssl/evp.h> |
41 | 41 | ||
@@ -312,6 +312,9 @@ main(int argc, char **argv) | |||
312 | char *sc_reader_id = NULL; | 312 | char *sc_reader_id = NULL; |
313 | int i, ch, deleting = 0, ret = 0; | 313 | int i, ch, deleting = 0, ret = 0; |
314 | 314 | ||
315 | /* Ensure that fds 0, 1 and 2 are open or directed to /dev/null */ | ||
316 | sanitise_stdfd(); | ||
317 | |||
315 | __progname = ssh_get_progname(argv[0]); | 318 | __progname = ssh_get_progname(argv[0]); |
316 | init_rng(); | 319 | init_rng(); |
317 | seed_rng(); | 320 | seed_rng(); |
@@ -321,7 +324,8 @@ main(int argc, char **argv) | |||
321 | /* At first, get a connection to the authentication agent. */ | 324 | /* At first, get a connection to the authentication agent. */ |
322 | ac = ssh_get_authentication_connection(); | 325 | ac = ssh_get_authentication_connection(); |
323 | if (ac == NULL) { | 326 | if (ac == NULL) { |
324 | fprintf(stderr, "Could not open a connection to your authentication agent.\n"); | 327 | fprintf(stderr, |
328 | "Could not open a connection to your authentication agent.\n"); | ||
325 | exit(2); | 329 | exit(2); |
326 | } | 330 | } |
327 | while ((ch = getopt(argc, argv, "lLcdDxXe:s:t:")) != -1) { | 331 | while ((ch = getopt(argc, argv, "lLcdDxXe:s:t:")) != -1) { |