summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Lindstrom <mouring@eviladmin.org>2001-03-06 01:10:53 +0000
committerBen Lindstrom <mouring@eviladmin.org>2001-03-06 01:10:53 +0000
commit1e62174af12575265399dc27f3a4937109fe7b28 (patch)
tree25074a504939e998c49d509c6a1bffe7fc0dcec9
parent4c4f05e09647ec68becba9664b6b84e643fc0578 (diff)
- stevesk@cvs.openbsd.org 2001/03/05 17:40:48
[ssh.1] more ssh_known_hosts2 documentation; ok markus@
-rw-r--r--ChangeLog5
-rw-r--r--ssh.123
2 files changed, 22 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 20f63aa3d..e0f631b44 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -24,6 +24,9 @@
24 P. C. van Oorschot and M. J. Wiener, On Diffie-Hellman key 24 P. C. van Oorschot and M. J. Wiener, On Diffie-Hellman key
25 agreement with short exponents, In Advances in Cryptology 25 agreement with short exponents, In Advances in Cryptology
26 - EUROCRYPT'96, LNCS 1070, Springer-Verlag, 1996, pp.332-343. 26 - EUROCRYPT'96, LNCS 1070, Springer-Verlag, 1996, pp.332-343.
27 - stevesk@cvs.openbsd.org 2001/03/05 17:40:48
28 [ssh.1]
29 more ssh_known_hosts2 documentation; ok markus@
27 30
2820010305 3120010305
29 - (bal) CVS ID touch up on sshpty.[ch] and sshlogin.[ch] 32 - (bal) CVS ID touch up on sshpty.[ch] and sshlogin.[ch]
@@ -4395,4 +4398,4 @@
4395 - Wrote replacements for strlcpy and mkdtemp 4398 - Wrote replacements for strlcpy and mkdtemp
4396 - Released 1.0pre1 4399 - Released 1.0pre1
4397 4400
4398$Id: ChangeLog,v 1.913 2001/03/06 01:09:20 mouring Exp $ 4401$Id: ChangeLog,v 1.914 2001/03/06 01:10:53 mouring Exp $
diff --git a/ssh.1 b/ssh.1
index 79b075fff..c45b09939 100644
--- a/ssh.1
+++ b/ssh.1
@@ -34,7 +34,7 @@
34.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 34.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
35.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 35.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
36.\" 36.\"
37.\" $OpenBSD: ssh.1,v 1.94 2001/03/05 15:56:16 deraadt Exp $ 37.\" $OpenBSD: ssh.1,v 1.95 2001/03/05 17:40:48 stevesk Exp $
38.Dd September 25, 1999 38.Dd September 25, 1999
39.Dt SSH 1 39.Dt SSH 1
40.Os 40.Os
@@ -750,8 +750,13 @@ or
750The default is 750The default is
751.Dq no . 751.Dq no .
752.It Cm GlobalKnownHostsFile 752.It Cm GlobalKnownHostsFile
753Specifies a file to use instead of 753Specifies a file to use for the protocol version 1 global
754host key database instead of
754.Pa /etc/ssh_known_hosts . 755.Pa /etc/ssh_known_hosts .
756.It Cm GlobalKnownHostsFile2
757Specifies a file to use for the protocol version 2 global
758host key database instead of
759.Pa /etc/ssh_known_hosts2 .
755.It Cm HostKeyAlias 760.It Cm HostKeyAlias
756Specifies an alias that should be used instead of the 761Specifies an alias that should be used instead of the
757real host name when looking up or saving the host key 762real host name when looking up or saving the host key
@@ -999,8 +1004,13 @@ This can be useful if you have a different user name on different machines.
999This saves the trouble of 1004This saves the trouble of
1000having to remember to give the user name on the command line. 1005having to remember to give the user name on the command line.
1001.It Cm UserKnownHostsFile 1006.It Cm UserKnownHostsFile
1002Specifies a file to use instead of 1007Specifies a file to use for the protocol version 1 user
1008host key database instead of
1003.Pa $HOME/.ssh/known_hosts . 1009.Pa $HOME/.ssh/known_hosts .
1010.It Cm UserKnownHostsFile2
1011Specifies a file to use for the protocol version 2 user
1012host key database instead of
1013.Pa $HOME/.ssh/known_hosts2 .
1004.It Cm UseRsh 1014.It Cm UseRsh
1005Specifies that rlogin/rsh should be used for this host. 1015Specifies that rlogin/rsh should be used for this host.
1006It is possible that the host does not at all support the 1016It is possible that the host does not at all support the
@@ -1091,10 +1101,13 @@ and adds lines of the format
1091to the environment. 1101to the environment.
1092.Sh FILES 1102.Sh FILES
1093.Bl -tag -width Ds 1103.Bl -tag -width Ds
1094.It Pa $HOME/.ssh/known_hosts 1104.It Pa $HOME/.ssh/known_hosts, $HOME/.ssh/known_hosts2
1095Records host keys for all hosts the user has logged into (that are not 1105Records host keys for all hosts the user has logged into (that are not
1096in 1106in
1097.Pa /etc/ssh_known_hosts ) . 1107.Pa /etc/ssh_known_hosts
1108for protocol version 1 or
1109.Pa /etc/ssh_known_hosts2
1110for protocol version 2).
1098See 1111See
1099.Xr sshd 8 . 1112.Xr sshd 8 .
1100.It Pa $HOME/.ssh/identity, $HOME/.ssh/id_dsa 1113.It Pa $HOME/.ssh/identity, $HOME/.ssh/id_dsa