summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--ssh-agent.110
2 files changed, 10 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 19ab3564..6169fb34 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -75,6 +75,9 @@
- stevesk@cvs.openbsd.org 2002/02/03 22:35:57
[ssh.1 sshd.8]
some KeepAlive cleanup/clarify; ok markus@
+ - stevesk@cvs.openbsd.org 2002/02/03 23:22:59
+ [ssh-agent.1]
+ ssh-add also adds $HOME/.ssh/id_rsa and $HOME/.ssh/id_dsa now.
20020130
- (djm) Delay PRNG seeding until we need it in ssh-keygen, from markus@
@@ -7477,4 +7480,4 @@
- Wrote replacements for strlcpy and mkdtemp
- Released 1.0pre1
-$Id: ChangeLog,v 1.1819 2002/02/05 01:23:58 djm Exp $
+$Id: ChangeLog,v 1.1820 2002/02/05 01:24:19 djm Exp $
diff --git a/ssh-agent.1 b/ssh-agent.1
index 2b9f3d97..1e1b72c3 100644
--- a/ssh-agent.1
+++ b/ssh-agent.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: ssh-agent.1,v 1.29 2001/11/19 18:40:46 stevesk Exp $
+.\" $OpenBSD: ssh-agent.1,v 1.30 2002/02/03 23:22:59 stevesk Exp $
.\"
.\" Author: Tatu Ylonen <ylo@cs.hut.fi>
.\" Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -94,9 +94,11 @@ Keys are added using
.Xr ssh-add 1 .
When executed without arguments,
.Xr ssh-add 1
-adds the
-.Pa $HOME/.ssh/identity
-file.
+adds the files
+.Pa $HOME/.ssh/id_rsa ,
+.Pa $HOME/.ssh/id_dsa
+and
+.Pa $HOME/.ssh/identity .
If the identity has a passphrase,
.Xr ssh-add 1
asks for the passphrase (using a small X11 application if running