summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2002-02-08 22:02:16 +1100
committerDamien Miller <djm@mindrot.org>2002-02-08 22:02:16 +1100
commite8c9ed436a23d0fdbad1881092a3f9d2e7d5f822 (patch)
tree44ccbdf0695e65edd5dade6cf3f7e81ad3367716
parent5aa5d78e40da7a1f731082a6b3b1e0b97dbe4da0 (diff)
- stevesk@cvs.openbsd.org 2002/02/04 20:41:16
[ssh-agent.1] more sync for default ssh-add identities; ok markus@
-rw-r--r--ChangeLog5
-rw-r--r--ssh-agent.111
2 files changed, 5 insertions, 11 deletions
diff --git a/ChangeLog b/ChangeLog
index 3a123c3e..aa1a6fe2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,9 @@
[sshd.c]
add SYSLOG_FACILITY_NOT_SET = -1, SYSLOG_LEVEL_NOT_SET = -1,
fixes arm/netbsd; based on patch from bjh21@netbsd.org; ok djm@
+ - stevesk@cvs.openbsd.org 2002/02/04 20:41:16
+ [ssh-agent.1]
+ more sync for default ssh-add identities; ok markus@
20020205
- (djm) Cleanup after sync:
@@ -7510,4 +7513,4 @@
- Wrote replacements for strlcpy and mkdtemp
- Released 1.0pre1
-$Id: ChangeLog,v 1.1828 2002/02/08 11:01:54 djm Exp $
+$Id: ChangeLog,v 1.1829 2002/02/08 11:02:16 djm Exp $
diff --git a/ssh-agent.1 b/ssh-agent.1
index 1e1b72c3..9909ef59 100644
--- a/ssh-agent.1
+++ b/ssh-agent.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: ssh-agent.1,v 1.30 2002/02/03 23:22:59 stevesk Exp $
+.\" $OpenBSD: ssh-agent.1,v 1.31 2002/02/04 20:41:16 stevesk Exp $
.\"
.\" Author: Tatu Ylonen <ylo@cs.hut.fi>
.\" Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -154,15 +154,6 @@ line terminates.
.Bl -tag -width Ds
.It Pa $HOME/.ssh/identity
Contains the protocol version 1 RSA authentication identity of the user.
-This file should not be readable by anyone but the user.
-It is possible to
-specify a passphrase when generating the key; that passphrase will be
-used to encrypt the private part of this file.
-This file is not used by
-.Nm
-but is normally added to the agent using
-.Xr ssh-add 1
-at login time.
.It Pa $HOME/.ssh/id_dsa
Contains the protocol version 2 DSA authentication identity of the user.
.It Pa $HOME/.ssh/id_rsa