summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2002-09-22 01:26:00 +1000
committerDamien Miller <djm@mindrot.org>2002-09-22 01:26:00 +1000
commit2138d152b23ab6f5f1aa127fc8959688c4fb6ce0 (patch)
tree75ba40f1199ace8909c32e24e16f1412106fecd6
parenta0e4559d720a25e06911847092356d78be200291 (diff)
- markus@cvs.openbsd.org 2002/09/19 15:51:23
[ssh-add.c] typo; cd@kalkatraz.de
-rw-r--r--ChangeLog5
-rw-r--r--ssh-add.c4
2 files changed, 6 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 7bed3e53e..82415d2ef 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,9 @@
2 - (djm) OpenBSD CVS Sync 2 - (djm) OpenBSD CVS Sync
3 - stevesk@cvs.openbsd.org 2002/09/19 14:53:14 3 - stevesk@cvs.openbsd.org 2002/09/19 14:53:14
4 [compat.c] 4 [compat.c]
5 - markus@cvs.openbsd.org 2002/09/19 15:51:23
6 [ssh-add.c]
7 typo; cd@kalkatraz.de
5 8
620020919 920020919
7 - (djm) OpenBSD CVS Sync 10 - (djm) OpenBSD CVS Sync
@@ -683,4 +686,4 @@
683 save auth method before monitor_reset_key_state(); bugzilla bug #284; 686 save auth method before monitor_reset_key_state(); bugzilla bug #284;
684 ok provos@ 687 ok provos@
685 688
686$Id: ChangeLog,v 1.2472 2002/09/21 15:25:35 djm Exp $ 689$Id: ChangeLog,v 1.2473 2002/09/21 15:26:00 djm Exp $
diff --git a/ssh-add.c b/ssh-add.c
index 51490b776..9c729752a 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.62 2002/06/26 14:51:33 markus Exp $"); 38RCSID("$OpenBSD: ssh-add.c,v 1.63 2002/09/19 15:51:23 markus Exp $");
39 39
40#include <openssl/evp.h> 40#include <openssl/evp.h>
41 41
@@ -290,7 +290,7 @@ usage(void)
290 fprintf(stderr, " -d Delete identity.\n"); 290 fprintf(stderr, " -d Delete identity.\n");
291 fprintf(stderr, " -D Delete all identities.\n"); 291 fprintf(stderr, " -D Delete all identities.\n");
292 fprintf(stderr, " -x Lock agent.\n"); 292 fprintf(stderr, " -x Lock agent.\n");
293 fprintf(stderr, " -x Unlock agent.\n"); 293 fprintf(stderr, " -X Unlock agent.\n");
294 fprintf(stderr, " -t life Set lifetime (in seconds) when adding identities.\n"); 294 fprintf(stderr, " -t life Set lifetime (in seconds) when adding identities.\n");
295#ifdef SMARTCARD 295#ifdef SMARTCARD
296 fprintf(stderr, " -s reader Add key in smartcard reader.\n"); 296 fprintf(stderr, " -s reader Add key in smartcard reader.\n");