summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--ssh-add.14
2 files changed, 6 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 206e72501..743c7457d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -54,6 +54,9 @@
54 - markus@cvs.openbsd.org 2003/02/06 21:22:43 54 - markus@cvs.openbsd.org 2003/02/06 21:22:43
55 [auth1.c auth2.c] 55 [auth1.c auth2.c]
56 undo broken fix for #387, fixes #486 56 undo broken fix for #387, fixes #486
57 - markus@cvs.openbsd.org 2003/02/10 11:51:47
58 [ssh-add.1]
59 xref sshd_config.5 (not sshd.8); mark@summersault.com; bug #490
57 60
5820030211 6120030211
59 - (djm) Cygwin needs libcrypt too. Patch from vinschen@redhat.com 62 - (djm) Cygwin needs libcrypt too. Patch from vinschen@redhat.com
@@ -1154,4 +1157,4 @@
1154 save auth method before monitor_reset_key_state(); bugzilla bug #284; 1157 save auth method before monitor_reset_key_state(); bugzilla bug #284;
1155 ok provos@ 1158 ok provos@
1156 1159
1157$Id: ChangeLog,v 1.2608 2003/02/24 00:59:26 djm Exp $ 1160$Id: ChangeLog,v 1.2609 2003/02/24 01:00:16 djm Exp $
diff --git a/ssh-add.1 b/ssh-add.1
index 66a8f9715..25d7333e9 100644
--- a/ssh-add.1
+++ b/ssh-add.1
@@ -1,4 +1,4 @@
1.\" $OpenBSD: ssh-add.1,v 1.36 2003/01/23 13:50:27 markus Exp $ 1.\" $OpenBSD: ssh-add.1,v 1.37 2003/02/10 11:51:47 markus Exp $
2.\" 2.\"
3.\" -*- nroff -*- 3.\" -*- nroff -*-
4.\" 4.\"
@@ -92,7 +92,7 @@ Unlock the agent.
92Set a maximum lifetime when adding identities to an agent. 92Set a maximum lifetime when adding identities to an agent.
93The lifetime may be specified in seconds or in a time format 93The lifetime may be specified in seconds or in a time format
94specified in 94specified in
95.Xr sshd 8 . 95.Xr sshd_config 5 .
96.It Fl c 96.It Fl c
97Indicates that added identities should be subject to confirmation before 97Indicates that added identities should be subject to confirmation before
98being used for authentication. Confirmation is performed by the 98being used for authentication. Confirmation is performed by the