mirror of git://anongit.mindrot.org/openssh.git
- jmc@cvs.openbsd.org 2008/06/10 08:17:40
[sshd.8 sshd.c]
- update usage()
- fix SYNOPSIS, and sort options
- some minor additional fixes
This commit is contained in:
Darren Tucker
parent
6a2a400f7a
commit
e7f3f75651
|
|
@ -21,6 +21,11 @@
|
|||
- jmc@cvs.openbsd.org 2008/06/10 07:12:00
|
||||
[sshd_config.5]
|
||||
tweak previous;
|
||||
- jmc@cvs.openbsd.org 2008/06/10 08:17:40
|
||||
[sshd.8 sshd.c]
|
||||
- update usage()
|
||||
- fix SYNOPSIS, and sort options
|
||||
- some minor additional fixes
|
||||
|
||||
20080609
|
||||
- (dtucker) OpenBSD CVS Sync
|
||||
|
|
@ -4107,4 +4112,4 @@
|
|||
OpenServer 6 and add osr5bigcrypt support so when someone migrates
|
||||
passwords between UnixWare and OpenServer they will still work. OK dtucker@
|
||||
|
||||
$Id: ChangeLog,v 1.4952 2008/06/10 13:03:04 dtucker Exp $
|
||||
$Id: ChangeLog,v 1.4953 2008/06/10 13:06:01 dtucker Exp $
|
||||
|
|
|
|||
52
sshd.8
52
sshd.8
|
|
@ -34,7 +34,7 @@
|
|||
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
|
||||
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
.\"
|
||||
.\" $OpenBSD: sshd.8,v 1.242 2008/06/10 04:50:25 dtucker Exp $
|
||||
.\" $OpenBSD: sshd.8,v 1.243 2008/06/10 08:17:40 jmc Exp $
|
||||
.Dd $Mdocdate: June 10 2008 $
|
||||
.Dt SSHD 8
|
||||
.Os
|
||||
|
|
@ -44,7 +44,7 @@
|
|||
.Sh SYNOPSIS
|
||||
.Nm sshd
|
||||
.Bk -words
|
||||
.Op Fl 46DTdeiqt
|
||||
.Op Fl 46DdeiqTt
|
||||
.Op Fl b Ar bits
|
||||
.Op Fl C Ar connection_spec
|
||||
.Op Fl f Ar config_file
|
||||
|
|
@ -101,6 +101,24 @@ to use IPv6 addresses only.
|
|||
.It Fl b Ar bits
|
||||
Specifies the number of bits in the ephemeral protocol version 1
|
||||
server key (default 768).
|
||||
.It Fl C Ar connection_spec
|
||||
Specify the connection parameters to use for the
|
||||
.Fl T
|
||||
extended test mode.
|
||||
If provided, any
|
||||
.Cm Match
|
||||
directives in the configuration file
|
||||
that would apply to the specified user, host, and address will be set before
|
||||
the configuration is written to standard output.
|
||||
The connection parameters are supplied as keyword=value pairs.
|
||||
The keywords are
|
||||
.Dq user ,
|
||||
.Dq host ,
|
||||
and
|
||||
.Dq addr .
|
||||
All are required and may be supplied in any order, either with multiple
|
||||
.Fl C
|
||||
options or as a comma-separated list.
|
||||
.It Fl D
|
||||
When this option is specified,
|
||||
.Nm
|
||||
|
|
@ -192,12 +210,6 @@ Quiet mode.
|
|||
Nothing is sent to the system log.
|
||||
Normally the beginning,
|
||||
authentication, and termination of each connection is logged.
|
||||
.It Fl t
|
||||
Test mode.
|
||||
Only check the validity of the configuration file and sanity of the keys.
|
||||
This is useful for updating
|
||||
.Nm
|
||||
reliably as configuration options may change.
|
||||
.It Fl T
|
||||
Extended test mode.
|
||||
Check the validity of the configuration file, output the effective configuration
|
||||
|
|
@ -207,24 +219,12 @@ Optionally,
|
|||
rules may be applied by specifying the connection parameters using one or more
|
||||
.Fl C
|
||||
options.
|
||||
.It Fl C
|
||||
Specify the connection parameters to use for the the
|
||||
.Fl T
|
||||
extended test mode.
|
||||
If provided, any
|
||||
.Cm Match
|
||||
directives in the configuration file
|
||||
that would apply to the specified user, host and address will be set before
|
||||
the configuration is written to standard output.
|
||||
The connection parameters are supplied as keyword=value pairs.
|
||||
The keywords are
|
||||
.Dq user ,
|
||||
.Dq host
|
||||
and
|
||||
.Dq addr
|
||||
All are required and may be supplied in any order, either with multiple
|
||||
.Fl C
|
||||
options or as a comma-separated list.
|
||||
.It Fl t
|
||||
Test mode.
|
||||
Only check the validity of the configuration file and sanity of the keys.
|
||||
This is useful for updating
|
||||
.Nm
|
||||
reliably as configuration options may change.
|
||||
.It Fl u Ar len
|
||||
This option is used to specify the size of the field
|
||||
in the
|
||||
|
|
|
|||
7
sshd.c
7
sshd.c
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: sshd.c,v 1.358 2008/06/10 04:50:25 dtucker Exp $ */
|
||||
/* $OpenBSD: sshd.c,v 1.359 2008/06/10 08:17:40 jmc Exp $ */
|
||||
/*
|
||||
* Author: Tatu Ylonen <ylo@cs.hut.fi>
|
||||
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
|
||||
|
|
@ -804,8 +804,9 @@ usage(void)
|
|||
fprintf(stderr, "%s, %s\n",
|
||||
SSH_RELEASE, SSLeay_version(SSLEAY_VERSION));
|
||||
fprintf(stderr,
|
||||
"usage: sshd [-46Ddeiqt] [-b bits] [-f config_file] [-g login_grace_time]\n"
|
||||
" [-h host_key_file] [-k key_gen_time] [-o option] [-p port] [-u len]\n"
|
||||
"usage: sshd [-46DdeiqTt] [-b bits] [-C connection_spec] [-f config_file]\n"
|
||||
" [-g login_grace_time] [-h host_key_file] [-k key_gen_time]\n"
|
||||
" [-o option] [-p port] [-u len]\n"
|
||||
);
|
||||
exit(1);
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue