diff options
| author | Damien Miller <djm@mindrot.org> | 2005-03-02 12:04:01 +1100 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2005-03-02 12:04:01 +1100 |
| commit | 9a2fdbd0d6e13dd28612a351561adb6b32b94bd5 (patch) | |
| tree | 3d255df7d03a16fd1b53e22eb34299f98cf715ff | |
| parent | 4c9c6fdcfe21dcb220fb51177e6caa75e97c3d38 (diff) | |
- jmc@cvs.openbsd.org 2005/03/01 15:47:14
[ssh-keyscan.1 ssh-keyscan.c]
sort options and sync usage();
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ssh-keyscan.1 | 44 | ||||
| -rw-r--r-- | ssh-keyscan.c | 4 |
3 files changed, 28 insertions, 25 deletions
@@ -15,6 +15,9 @@ - jmc@cvs.openbsd.org 2005/03/01 15:05:00 [ssh-keygen.1] whitespace; + - jmc@cvs.openbsd.org 2005/03/01 15:47:14 + [ssh-keyscan.1 ssh-keyscan.c] + sort options and sync usage(); 20050301 - (djm) OpenBSD CVS sync: @@ -2234,4 +2237,4 @@ - (djm) Trim deprecated options from INSTALL. Mention UsePAM - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu -$Id: ChangeLog,v 1.3679 2005/03/02 01:03:43 djm Exp $ +$Id: ChangeLog,v 1.3680 2005/03/02 01:04:01 djm Exp $ diff --git a/ssh-keyscan.1 b/ssh-keyscan.1 index 63427e72..7e846f77 100644 --- 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.20 2005/03/01 15:47:14 jmc Exp $ .\" .\" Copyright 1995, 1996 by David Mazieres <dm@lcs.mit.edu>. .\" @@ -15,11 +15,11 @@ .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 f Ar file .Op Ar host | addrlist namelist .Op Ar ... .Ek @@ -46,6 +46,25 @@ scanning process involve any encryption. .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 @@ -76,30 +95,11 @@ 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. .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 If a ssh_known_hosts file is constructed using diff --git a/ssh-keyscan.c b/ssh-keyscan.c index e9486700..bc2c3b72 100644 --- a/ssh-keyscan.c +++ b/ssh-keyscan.c @@ -7,7 +7,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: ssh-keyscan.c,v 1.51 2005/03/01 10:41:28 djm Exp $"); +RCSID("$OpenBSD: ssh-keyscan.c,v 1.52 2005/03/01 15:47:14 jmc Exp $"); #include "openbsd-compat/sys-queue.h" @@ -683,7 +683,7 @@ fatal(const char *fmt,...) static void usage(void) { - fprintf(stderr, "usage: %s [-Hv46] [-p port] [-T timeout] [-t type] [-f file]\n" + fprintf(stderr, "usage: %s [-46Hv] [-f file] [-p port] [-T timeout] [-t type]\n" "\t\t [host | addrlist namelist] [...]\n", __progname); exit(1); |