diff options
-rw-r--r-- | ChangeLog | 7 | ||||
-rw-r--r-- | sshd.8 | 52 | ||||
-rw-r--r-- | sshd.c | 7 |
3 files changed, 36 insertions, 30 deletions
@@ -21,6 +21,11 @@ | |||
21 | - jmc@cvs.openbsd.org 2008/06/10 07:12:00 | 21 | - jmc@cvs.openbsd.org 2008/06/10 07:12:00 |
22 | [sshd_config.5] | 22 | [sshd_config.5] |
23 | tweak previous; | 23 | tweak previous; |
24 | - jmc@cvs.openbsd.org 2008/06/10 08:17:40 | ||
25 | [sshd.8 sshd.c] | ||
26 | - update usage() | ||
27 | - fix SYNOPSIS, and sort options | ||
28 | - some minor additional fixes | ||
24 | 29 | ||
25 | 20080609 | 30 | 20080609 |
26 | - (dtucker) OpenBSD CVS Sync | 31 | - (dtucker) OpenBSD CVS Sync |
@@ -4107,4 +4112,4 @@ | |||
4107 | OpenServer 6 and add osr5bigcrypt support so when someone migrates | 4112 | OpenServer 6 and add osr5bigcrypt support so when someone migrates |
4108 | passwords between UnixWare and OpenServer they will still work. OK dtucker@ | 4113 | passwords between UnixWare and OpenServer they will still work. OK dtucker@ |
4109 | 4114 | ||
4110 | $Id: ChangeLog,v 1.4952 2008/06/10 13:03:04 dtucker Exp $ | 4115 | $Id: ChangeLog,v 1.4953 2008/06/10 13:06:01 dtucker Exp $ |
@@ -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: sshd.8,v 1.242 2008/06/10 04:50:25 dtucker Exp $ | 37 | .\" $OpenBSD: sshd.8,v 1.243 2008/06/10 08:17:40 jmc Exp $ |
38 | .Dd $Mdocdate: June 10 2008 $ | 38 | .Dd $Mdocdate: June 10 2008 $ |
39 | .Dt SSHD 8 | 39 | .Dt SSHD 8 |
40 | .Os | 40 | .Os |
@@ -44,7 +44,7 @@ | |||
44 | .Sh SYNOPSIS | 44 | .Sh SYNOPSIS |
45 | .Nm sshd | 45 | .Nm sshd |
46 | .Bk -words | 46 | .Bk -words |
47 | .Op Fl 46DTdeiqt | 47 | .Op Fl 46DdeiqTt |
48 | .Op Fl b Ar bits | 48 | .Op Fl b Ar bits |
49 | .Op Fl C Ar connection_spec | 49 | .Op Fl C Ar connection_spec |
50 | .Op Fl f Ar config_file | 50 | .Op Fl f Ar config_file |
@@ -101,6 +101,24 @@ to use IPv6 addresses only. | |||
101 | .It Fl b Ar bits | 101 | .It Fl b Ar bits |
102 | Specifies the number of bits in the ephemeral protocol version 1 | 102 | Specifies the number of bits in the ephemeral protocol version 1 |
103 | server key (default 768). | 103 | server key (default 768). |
104 | .It Fl C Ar connection_spec | ||
105 | Specify the connection parameters to use for the | ||
106 | .Fl T | ||
107 | extended test mode. | ||
108 | If provided, any | ||
109 | .Cm Match | ||
110 | directives in the configuration file | ||
111 | that would apply to the specified user, host, and address will be set before | ||
112 | the configuration is written to standard output. | ||
113 | The connection parameters are supplied as keyword=value pairs. | ||
114 | The keywords are | ||
115 | .Dq user , | ||
116 | .Dq host , | ||
117 | and | ||
118 | .Dq addr . | ||
119 | All are required and may be supplied in any order, either with multiple | ||
120 | .Fl C | ||
121 | options or as a comma-separated list. | ||
104 | .It Fl D | 122 | .It Fl D |
105 | When this option is specified, | 123 | When this option is specified, |
106 | .Nm | 124 | .Nm |
@@ -192,12 +210,6 @@ Quiet mode. | |||
192 | Nothing is sent to the system log. | 210 | Nothing is sent to the system log. |
193 | Normally the beginning, | 211 | Normally the beginning, |
194 | authentication, and termination of each connection is logged. | 212 | authentication, and termination of each connection is logged. |
195 | .It Fl t | ||
196 | Test mode. | ||
197 | Only check the validity of the configuration file and sanity of the keys. | ||
198 | This is useful for updating | ||
199 | .Nm | ||
200 | reliably as configuration options may change. | ||
201 | .It Fl T | 213 | .It Fl T |
202 | Extended test mode. | 214 | Extended test mode. |
203 | Check the validity of the configuration file, output the effective configuration | 215 | Check the validity of the configuration file, output the effective configuration |
@@ -207,24 +219,12 @@ Optionally, | |||
207 | rules may be applied by specifying the connection parameters using one or more | 219 | rules may be applied by specifying the connection parameters using one or more |
208 | .Fl C | 220 | .Fl C |
209 | options. | 221 | options. |
210 | .It Fl C | 222 | .It Fl t |
211 | Specify the connection parameters to use for the the | 223 | Test mode. |
212 | .Fl T | 224 | Only check the validity of the configuration file and sanity of the keys. |
213 | extended test mode. | 225 | This is useful for updating |
214 | If provided, any | 226 | .Nm |
215 | .Cm Match | 227 | reliably as configuration options may change. |
216 | directives in the configuration file | ||
217 | that would apply to the specified user, host and address will be set before | ||
218 | the configuration is written to standard output. | ||
219 | The connection parameters are supplied as keyword=value pairs. | ||
220 | The keywords are | ||
221 | .Dq user , | ||
222 | .Dq host | ||
223 | and | ||
224 | .Dq addr | ||
225 | All are required and may be supplied in any order, either with multiple | ||
226 | .Fl C | ||
227 | options or as a comma-separated list. | ||
228 | .It Fl u Ar len | 228 | .It Fl u Ar len |
229 | This option is used to specify the size of the field | 229 | This option is used to specify the size of the field |
230 | in the | 230 | in the |
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: sshd.c,v 1.358 2008/06/10 04:50:25 dtucker Exp $ */ | 1 | /* $OpenBSD: sshd.c,v 1.359 2008/06/10 08:17:40 jmc Exp $ */ |
2 | /* | 2 | /* |
3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
@@ -804,8 +804,9 @@ usage(void) | |||
804 | fprintf(stderr, "%s, %s\n", | 804 | fprintf(stderr, "%s, %s\n", |
805 | SSH_RELEASE, SSLeay_version(SSLEAY_VERSION)); | 805 | SSH_RELEASE, SSLeay_version(SSLEAY_VERSION)); |
806 | fprintf(stderr, | 806 | fprintf(stderr, |
807 | "usage: sshd [-46Ddeiqt] [-b bits] [-f config_file] [-g login_grace_time]\n" | 807 | "usage: sshd [-46DdeiqTt] [-b bits] [-C connection_spec] [-f config_file]\n" |
808 | " [-h host_key_file] [-k key_gen_time] [-o option] [-p port] [-u len]\n" | 808 | " [-g login_grace_time] [-h host_key_file] [-k key_gen_time]\n" |
809 | " [-o option] [-p port] [-u len]\n" | ||
809 | ); | 810 | ); |
810 | exit(1); | 811 | exit(1); |
811 | } | 812 | } |