summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2009-01-28 16:18:03 +1100
committerDamien Miller <djm@mindrot.org>2009-01-28 16:18:03 +1100
commitb2c17d4b173103fa8621f5a11de0ba56840e86af (patch)
treecc1f1f3d7e7244242bc622e1c01b317d1ee90cd4
parent7375fe2c6d42e62b30a90e7a874f188c891061d5 (diff)
- stevesk@cvs.openbsd.org 2008/12/29 01:12:36
[ssh-keyscan.1] fix example, default key type is rsa for 3+ years; from frederic.perrin@resel.fr
-rw-r--r--ChangeLog6
-rw-r--r--ssh-keyscan.16
2 files changed, 8 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 012a66514..7dcd78087 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -20,6 +20,10 @@
20 - stevesk@cvs.openbsd.org 2008/12/10 03:55:20 20 - stevesk@cvs.openbsd.org 2008/12/10 03:55:20
21 [addrmatch.c] 21 [addrmatch.c]
22 o cannot be NULL here but use xfree() to be consistent; ok djm@ 22 o cannot be NULL here but use xfree() to be consistent; ok djm@
23 - stevesk@cvs.openbsd.org 2008/12/29 01:12:36
24 [ssh-keyscan.1]
25 fix example, default key type is rsa for 3+ years; from
26 frederic.perrin@resel.fr
23 27
2420090107 2820090107
25 - (djm) [uidswap.c] bz#1412: Support >16 supplemental groups in OS X. 29 - (djm) [uidswap.c] bz#1412: Support >16 supplemental groups in OS X.
@@ -5029,5 +5033,5 @@
5029 OpenServer 6 and add osr5bigcrypt support so when someone migrates 5033 OpenServer 6 and add osr5bigcrypt support so when someone migrates
5030 passwords between UnixWare and OpenServer they will still work. OK dtucker@ 5034 passwords between UnixWare and OpenServer they will still work. OK dtucker@
5031 5035
5032$Id: ChangeLog,v 1.5165 2009/01/28 05:16:00 djm Exp $ 5036$Id: ChangeLog,v 1.5166 2009/01/28 05:18:03 djm Exp $
5033 5037
diff --git a/ssh-keyscan.1 b/ssh-keyscan.1
index 299a6cc94..4a5864566 100644
--- a/ssh-keyscan.1
+++ b/ssh-keyscan.1
@@ -1,4 +1,4 @@
1.\" $OpenBSD: ssh-keyscan.1,v 1.25 2008/11/01 11:14:36 sobrado Exp $ 1.\" $OpenBSD: ssh-keyscan.1,v 1.26 2008/12/29 01:12:36 stevesk Exp $
2.\" 2.\"
3.\" Copyright 1995, 1996 by David Mazieres <dm@lcs.mit.edu>. 3.\" Copyright 1995, 1996 by David Mazieres <dm@lcs.mit.edu>.
4.\" 4.\"
@@ -6,7 +6,7 @@
6.\" permitted provided that due credit is given to the author and the 6.\" permitted provided that due credit is given to the author and the
7.\" OpenBSD project by leaving this copyright notice intact. 7.\" OpenBSD project by leaving this copyright notice intact.
8.\" 8.\"
9.Dd $Mdocdate: November 1 2008 $ 9.Dd $Mdocdate: December 29 2008 $
10.Dt SSH-KEYSCAN 1 10.Dt SSH-KEYSCAN 1
11.Os 11.Os
12.Sh NAME 12.Sh NAME
@@ -137,7 +137,7 @@ or
137.Pa /etc/ssh/ssh_known_hosts 137.Pa /etc/ssh/ssh_known_hosts
138.Sh EXAMPLES 138.Sh EXAMPLES
139Print the 139Print the
140.Pa rsa1 140.Pa rsa
141host key for machine 141host key for machine
142.Pa hostname : 142.Pa hostname :
143.Bd -literal 143.Bd -literal