diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | ssh-agent.1 | 11 |
2 files changed, 5 insertions, 11 deletions
@@ -4,6 +4,9 @@ | |||
4 | [sshd.c] | 4 | [sshd.c] |
5 | add SYSLOG_FACILITY_NOT_SET = -1, SYSLOG_LEVEL_NOT_SET = -1, | 5 | add SYSLOG_FACILITY_NOT_SET = -1, SYSLOG_LEVEL_NOT_SET = -1, |
6 | fixes arm/netbsd; based on patch from bjh21@netbsd.org; ok djm@ | 6 | fixes arm/netbsd; based on patch from bjh21@netbsd.org; ok djm@ |
7 | - stevesk@cvs.openbsd.org 2002/02/04 20:41:16 | ||
8 | [ssh-agent.1] | ||
9 | more sync for default ssh-add identities; ok markus@ | ||
7 | 10 | ||
8 | 20020205 | 11 | 20020205 |
9 | - (djm) Cleanup after sync: | 12 | - (djm) Cleanup after sync: |
@@ -7510,4 +7513,4 @@ | |||
7510 | - Wrote replacements for strlcpy and mkdtemp | 7513 | - Wrote replacements for strlcpy and mkdtemp |
7511 | - Released 1.0pre1 | 7514 | - Released 1.0pre1 |
7512 | 7515 | ||
7513 | $Id: ChangeLog,v 1.1828 2002/02/08 11:01:54 djm Exp $ | 7516 | $Id: ChangeLog,v 1.1829 2002/02/08 11:02:16 djm Exp $ |
diff --git a/ssh-agent.1 b/ssh-agent.1 index 1e1b72c33..9909ef590 100644 --- a/ssh-agent.1 +++ b/ssh-agent.1 | |||
@@ -1,4 +1,4 @@ | |||
1 | .\" $OpenBSD: ssh-agent.1,v 1.30 2002/02/03 23:22:59 stevesk Exp $ | 1 | .\" $OpenBSD: ssh-agent.1,v 1.31 2002/02/04 20:41:16 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 |
@@ -154,15 +154,6 @@ line terminates. | |||
154 | .Bl -tag -width Ds | 154 | .Bl -tag -width Ds |
155 | .It Pa $HOME/.ssh/identity | 155 | .It Pa $HOME/.ssh/identity |
156 | Contains the protocol version 1 RSA authentication identity of the user. | 156 | Contains the protocol version 1 RSA authentication identity of the user. |
157 | This file should not be readable by anyone but the user. | ||
158 | It is possible to | ||
159 | specify a passphrase when generating the key; that passphrase will be | ||
160 | used to encrypt the private part of this file. | ||
161 | This file is not used by | ||
162 | .Nm | ||
163 | but is normally added to the agent using | ||
164 | .Xr ssh-add 1 | ||
165 | at login time. | ||
166 | .It Pa $HOME/.ssh/id_dsa | 157 | .It Pa $HOME/.ssh/id_dsa |
167 | Contains the protocol version 2 DSA authentication identity of the user. | 158 | Contains the protocol version 2 DSA authentication identity of the user. |
168 | .It Pa $HOME/.ssh/id_rsa | 159 | .It Pa $HOME/.ssh/id_rsa |