summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2002-02-05 12:24:19 +1100
committerDamien Miller <djm@mindrot.org>2002-02-05 12:24:19 +1100
commitd2b8f1657e3ef8d892bcc4fc3857f216c1ca4127 (patch)
tree9ac49e322516c33ea4cc6551b42bb733c557de6c
parent9749c0c97288c2fa92882754f5069ba7c741af1a (diff)
- 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.
-rw-r--r--ChangeLog5
-rw-r--r--ssh-agent.110
2 files changed, 10 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 19ab35642..6169fb345 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -75,6 +75,9 @@
75 - stevesk@cvs.openbsd.org 2002/02/03 22:35:57 75 - stevesk@cvs.openbsd.org 2002/02/03 22:35:57
76 [ssh.1 sshd.8] 76 [ssh.1 sshd.8]
77 some KeepAlive cleanup/clarify; ok markus@ 77 some KeepAlive cleanup/clarify; ok markus@
78 - stevesk@cvs.openbsd.org 2002/02/03 23:22:59
79 [ssh-agent.1]
80 ssh-add also adds $HOME/.ssh/id_rsa and $HOME/.ssh/id_dsa now.
78 81
7920020130 8220020130
80 - (djm) Delay PRNG seeding until we need it in ssh-keygen, from markus@ 83 - (djm) Delay PRNG seeding until we need it in ssh-keygen, from markus@
@@ -7477,4 +7480,4 @@
7477 - Wrote replacements for strlcpy and mkdtemp 7480 - Wrote replacements for strlcpy and mkdtemp
7478 - Released 1.0pre1 7481 - Released 1.0pre1
7479 7482
7480$Id: ChangeLog,v 1.1819 2002/02/05 01:23:58 djm Exp $ 7483$Id: ChangeLog,v 1.1820 2002/02/05 01:24:19 djm Exp $
diff --git a/ssh-agent.1 b/ssh-agent.1
index 2b9f3d97c..1e1b72c33 100644
--- a/ssh-agent.1
+++ b/ssh-agent.1
@@ -1,4 +1,4 @@
1.\" $OpenBSD: ssh-agent.1,v 1.29 2001/11/19 18:40:46 stevesk Exp $ 1.\" $OpenBSD: ssh-agent.1,v 1.30 2002/02/03 23:22:59 stevesk Exp $
2.\" 2.\"
3.\" Author: Tatu Ylonen <ylo@cs.hut.fi> 3.\" Author: Tatu Ylonen <ylo@cs.hut.fi>
4.\" Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4.\" Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -94,9 +94,11 @@ Keys are added using
94.Xr ssh-add 1 . 94.Xr ssh-add 1 .
95When executed without arguments, 95When executed without arguments,
96.Xr ssh-add 1 96.Xr ssh-add 1
97adds the 97adds the files
98.Pa $HOME/.ssh/identity 98.Pa $HOME/.ssh/id_rsa ,
99file. 99.Pa $HOME/.ssh/id_dsa
100and
101.Pa $HOME/.ssh/identity .
100If the identity has a passphrase, 102If the identity has a passphrase,
101.Xr ssh-add 1 103.Xr ssh-add 1
102asks for the passphrase (using a small X11 application if running 104asks for the passphrase (using a small X11 application if running