diff options
-rw-r--r-- | ChangeLog | 8 | ||||
-rw-r--r-- | ssh-add.c | 5 |
2 files changed, 10 insertions, 3 deletions
@@ -1,3 +1,9 @@ | |||
1 | 20051122 | ||
2 | - (dtucker) OpenBSD CVS Sync | ||
3 | - deraadt@cvs.openbsd.org 2005/11/12 18:37:59 | ||
4 | [ssh-add.c] | ||
5 | space | ||
6 | |||
1 | 20051120 | 7 | 20051120 |
2 | - (dtucker) [openbsd-compat/openssl-compat.h] Add comment explaining what | 8 | - (dtucker) [openbsd-compat/openssl-compat.h] Add comment explaining what |
3 | is going on. | 9 | is going on. |
@@ -3306,4 +3312,4 @@ | |||
3306 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM | 3312 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM |
3307 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu | 3313 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu |
3308 | 3314 | ||
3309 | $Id: ChangeLog,v 1.3996 2005/11/20 03:09:59 dtucker Exp $ | 3315 | $Id: ChangeLog,v 1.3997 2005/11/22 08:37:08 dtucker Exp $ |
@@ -35,7 +35,7 @@ | |||
35 | */ | 35 | */ |
36 | 36 | ||
37 | #include "includes.h" | 37 | #include "includes.h" |
38 | RCSID("$OpenBSD: ssh-add.c,v 1.73 2005/09/13 23:40:07 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 | ||
@@ -324,7 +324,8 @@ main(int argc, char **argv) | |||
324 | /* At first, get a connection to the authentication agent. */ | 324 | /* At first, get a connection to the authentication agent. */ |
325 | ac = ssh_get_authentication_connection(); | 325 | ac = ssh_get_authentication_connection(); |
326 | if (ac == NULL) { | 326 | if (ac == NULL) { |
327 | 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"); | ||
328 | exit(2); | 329 | exit(2); |
329 | } | 330 | } |
330 | while ((ch = getopt(argc, argv, "lLcdDxXe:s:t:")) != -1) { | 331 | while ((ch = getopt(argc, argv, "lLcdDxXe:s:t:")) != -1) { |