summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Lindstrom <mouring@eviladmin.org>2001-04-10 02:46:54 +0000
committerBen Lindstrom <mouring@eviladmin.org>2001-04-10 02:46:54 +0000
commit12de61680e1767a30cb521869b816181e1766b35 (patch)
treec6152c644dcc0f87bae1dc9da6d18ea89a9ceaba
parentee61794620e6ce4d40ae0e3a90c2ee90bf5f4719 (diff)
- markus@cvs.openbsd.org 2001/04/09 15:19:49
[ssh-add.1] ssh-add retries the last passphrase...
-rw-r--r--ChangeLog5
-rw-r--r--ssh-add.14
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 51c38fd5f..51e6872c5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -15,6 +15,9 @@
15 not successful and after last try. 15 not successful and after last try.
16 based on discussions with espie@, jakob@, ... and code from jakob@ and 16 based on discussions with espie@, jakob@, ... and code from jakob@ and
17 wolfgang@wsrcc.com 17 wolfgang@wsrcc.com
18 - markus@cvs.openbsd.org 2001/04/09 15:19:49
19 [ssh-add.1]
20 ssh-add retries the last passphrase...
18 21
1920010409 2220010409
20 - (stevesk) use setresgid() for setegid() if needed 23 - (stevesk) use setresgid() for setegid() if needed
@@ -4984,4 +4987,4 @@
4984 - Wrote replacements for strlcpy and mkdtemp 4987 - Wrote replacements for strlcpy and mkdtemp
4985 - Released 1.0pre1 4988 - Released 1.0pre1
4986 4989
4987$Id: ChangeLog,v 1.1091 2001/04/10 02:45:32 mouring Exp $ 4990$Id: ChangeLog,v 1.1092 2001/04/10 02:46:54 mouring Exp $
diff --git a/ssh-add.1 b/ssh-add.1
index 1feca8e71..3cdf33745 100644
--- a/ssh-add.1
+++ b/ssh-add.1
@@ -1,4 +1,4 @@
1.\" $OpenBSD: ssh-add.1,v 1.22 2001/03/02 18:54:31 deraadt Exp $ 1.\" $OpenBSD: ssh-add.1,v 1.23 2001/04/09 15:19:49 markus Exp $
2.\" 2.\"
3.\" -*- nroff -*- 3.\" -*- nroff -*-
4.\" 4.\"
@@ -58,6 +58,8 @@ If any file requires a passphrase,
58.Nm 58.Nm
59asks for the passphrase from the user. 59asks for the passphrase from the user.
60The Passphrase it is read from the user's tty. 60The Passphrase it is read from the user's tty.
61.Nm
62retries the last passphrase if multiple identity files are given.
61.Pp 63.Pp
62The authentication agent must be running and must be an ancestor of 64The authentication agent must be running and must be an ancestor of
63the current process for 65the current process for