- djm@cvs.openbsd.org 2010/01/30 02:54:53

[openssh.git] / ssh-keyscan.1

diff --git a/ssh-keyscan.1 b/ssh-keyscan.1
index 63427e727d84a8b7b84a4a92b6f34c43cc839dea..01f3184621c235be08303a8701c014c95e0bd75f 100644 (file)
--- a/ssh-keyscan.1
+++ b/ssh-keyscan.1
@@ -1,4 +1,4 @@
-.\"    $OpenBSD: ssh-keyscan.1,v 1.19 2005/03/01 10:41:28 djm Exp $
+.\"    $OpenBSD: ssh-keyscan.1,v 1.28 2010/01/09 23:04:13 dtucker Exp $

 .\"
 .\" Copyright 1995, 1996 by David Mazieres <dm@lcs.mit.edu>.
 .\"
 .\"
 .\" Copyright 1995, 1996 by David Mazieres <dm@lcs.mit.edu>.
 .\"


@@ -6,7 +6,7 @@
 .\" permitted provided that due credit is given to the author and the
 .\" OpenBSD project by leaving this copyright notice intact.
 .\"
 .\" permitted provided that due credit is given to the author and the
 .\" OpenBSD project by leaving this copyright notice intact.
 .\"

-.Dd January 1, 1996
+.Dd $Mdocdate$

 .Dt SSH-KEYSCAN 1
 .Os
 .Sh NAME
 .Dt SSH-KEYSCAN 1
 .Os
 .Sh NAME


@@ -15,13 +15,13 @@
 .Sh SYNOPSIS
 .Nm ssh-keyscan
 .Bk -words
 .Sh SYNOPSIS
 .Nm ssh-keyscan
 .Bk -words

-.Op Fl Hv46
+.Op Fl 46Hv
+.Op Fl f Ar file

 .Op Fl p Ar port
 .Op Fl T Ar timeout
 .Op Fl t Ar type
 .Op Fl p Ar port
 .Op Fl T Ar timeout
 .Op Fl t Ar type

-.Op Fl f Ar file

 .Op Ar host | addrlist namelist
 .Op Ar host | addrlist namelist

-.Op Ar ...
+.Ar ...

 .Ek
 .Sh DESCRIPTION
 .Nm
 .Ek
 .Sh DESCRIPTION
 .Nm


@@ -46,6 +46,25 @@ scanning process involve any encryption.
 .Pp
 The options are as follows:
 .Bl -tag -width Ds
 .Pp
 The options are as follows:
 .Bl -tag -width Ds

+.It Fl 4
+Forces
+.Nm
+to use IPv4 addresses only.
+.It Fl 6
+Forces
+.Nm
+to use IPv6 addresses only.
+.It Fl f Ar file
+Read hosts or
+.Pa addrlist namelist
+pairs from this file, one per line.
+If
+.Pa -
+is supplied instead of a filename,
+.Nm
+will read hosts or
+.Pa addrlist namelist
+pairs from the standard input.

 .It Fl H
 Hash all hostnames and addresses in the output.
 Hashed names may be used normally by
 .It Fl H
 Hash all hostnames and addresses in the output.
 Hashed names may be used normally by


@@ -75,34 +94,15 @@ or
 for protocol version 2.
 Multiple values may be specified by separating them with commas.
 The default is
 for protocol version 2.
 Multiple values may be specified by separating them with commas.
 The default is

-.Dq rsa1 .
-.It Fl f Ar filename
-Read hosts or
-.Pa addrlist namelist
-pairs from this file, one per line.
-If
-.Pa -
-is supplied instead of a filename,
-.Nm
-will read hosts or
-.Pa addrlist namelist
-pairs from the standard input.
+.Dq rsa .

 .It Fl v
 Verbose mode.
 Causes
 .Nm
 to print debugging messages about its progress.
 .It Fl v
 Verbose mode.
 Causes
 .Nm
 to print debugging messages about its progress.

-.It Fl 4
-Forces
-.Nm
-to use IPv4 addresses only.
-.It Fl 6
-Forces
-.Nm
-to use IPv6 addresses only.

 .El
 .Sh SECURITY
 .El
 .Sh SECURITY

-If a ssh_known_hosts file is constructed using
+If an ssh_known_hosts file is constructed using

 .Nm
 without verifying the keys, users will be vulnerable to
 .Em man in the middle
 .Nm
 without verifying the keys, users will be vulnerable to
 .Em man in the middle


@@ -137,7 +137,7 @@ or
 .Pa /etc/ssh/ssh_known_hosts
 .Sh EXAMPLES
 Print the
 .Pa /etc/ssh/ssh_known_hosts
 .Sh EXAMPLES
 Print the

-.Pa rsa1
+.Pa rsa

 host key for machine
 .Pa hostname :
 .Bd -literal
 host key for machine
 .Pa hostname :
 .Bd -literal


@@ -156,6 +156,7 @@ $ ssh-keyscan -t rsa,dsa -f ssh_hosts | \e
 .Xr ssh 1 ,
 .Xr sshd 8
 .Sh AUTHORS
 .Xr ssh 1 ,
 .Xr sshd 8
 .Sh AUTHORS

+.An -nosplit

 .An David Mazieres Aq dm@lcs.mit.edu
 wrote the initial version, and
 .An Wayne Davison Aq wayned@users.sourceforge.net
 .An David Mazieres Aq dm@lcs.mit.edu
 wrote the initial version, and
 .An Wayne Davison Aq wayned@users.sourceforge.net