diff options
author | Damien Miller <djm@mindrot.org> | 2013-12-05 10:20:52 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2013-12-05 10:20:52 +1100 |
commit | bdb352a54f82df94a548e3874b22f2d6ae90328d (patch) | |
tree | 42f22799ec67ccffd569f889a93fd1d6d25c1f57 | |
parent | d937dc084a087090f1cf5395822c3ac958d33759 (diff) |
- jmc@cvs.openbsd.org 2013/11/26 12:14:54
[ssh.1 ssh.c]
- put -Q in the right place
- Ar was a poor choice for the arguments to -Q. i've chosen an
admittedly equally poor Cm, at least consistent with the rest
of the docs. also no need for multiple instances
- zap a now redundant Nm
- usage() sync
-rw-r--r-- | ChangeLog | 8 | ||||
-rw-r--r-- | ssh.1 | 9 | ||||
-rw-r--r-- | ssh.c | 10 |
3 files changed, 17 insertions, 10 deletions
@@ -8,6 +8,14 @@ | |||
8 | improve -Q usage and such. One usage change is that the option is now | 8 | improve -Q usage and such. One usage change is that the option is now |
9 | case-sensitive | 9 | case-sensitive |
10 | ok dtucker markus djm | 10 | ok dtucker markus djm |
11 | - jmc@cvs.openbsd.org 2013/11/26 12:14:54 | ||
12 | [ssh.1 ssh.c] | ||
13 | - put -Q in the right place | ||
14 | - Ar was a poor choice for the arguments to -Q. i've chosen an | ||
15 | admittedly equally poor Cm, at least consistent with the rest | ||
16 | of the docs. also no need for multiple instances | ||
17 | - zap a now redundant Nm | ||
18 | - usage() sync | ||
11 | 19 | ||
12 | 20131121 | 20 | 20131121 |
13 | - (djm) OpenBSD CVS Sync | 21 | - (djm) OpenBSD CVS Sync |
@@ -33,8 +33,8 @@ | |||
33 | .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | 33 | .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
34 | .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 34 | .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
35 | .\" | 35 | .\" |
36 | .\" $OpenBSD: ssh.1,v 1.341 2013/11/25 18:04:21 deraadt Exp $ | 36 | .\" $OpenBSD: ssh.1,v 1.342 2013/11/26 12:14:54 jmc Exp $ |
37 | .Dd $Mdocdate: November 25 2013 $ | 37 | .Dd $Mdocdate: November 26 2013 $ |
38 | .Dt SSH 1 | 38 | .Dt SSH 1 |
39 | .Os | 39 | .Os |
40 | .Sh NAME | 40 | .Sh NAME |
@@ -58,15 +58,14 @@ | |||
58 | .Op Fl O Ar ctl_cmd | 58 | .Op Fl O Ar ctl_cmd |
59 | .Op Fl o Ar option | 59 | .Op Fl o Ar option |
60 | .Op Fl p Ar port | 60 | .Op Fl p Ar port |
61 | .Op Fl Q Cm cipher | cipher-auth | mac | kex | key | ||
61 | .Op Fl R Oo Ar bind_address : Oc Ns Ar port : Ns Ar host : Ns Ar hostport | 62 | .Op Fl R Oo Ar bind_address : Oc Ns Ar port : Ns Ar host : Ns Ar hostport |
62 | .Op Fl S Ar ctl_path | 63 | .Op Fl S Ar ctl_path |
63 | .Op Fl Q Ar cipher | Ar cipher-auth | Ar mac | Ar kex | Ar key | ||
64 | .Op Fl W Ar host : Ns Ar port | 64 | .Op Fl W Ar host : Ns Ar port |
65 | .Op Fl w Ar local_tun Ns Op : Ns Ar remote_tun | 65 | .Op Fl w Ar local_tun Ns Op : Ns Ar remote_tun |
66 | .Oo Ar user Ns @ Oc Ns Ar hostname | 66 | .Oo Ar user Ns @ Oc Ns Ar hostname |
67 | .Op Ar command | 67 | .Op Ar command |
68 | .Ek | 68 | .Ek |
69 | .Nm | ||
70 | .Sh DESCRIPTION | 69 | .Sh DESCRIPTION |
71 | .Nm | 70 | .Nm |
72 | (SSH client) is a program for logging into a remote machine and for | 71 | (SSH client) is a program for logging into a remote machine and for |
@@ -496,7 +495,7 @@ For full details of the options listed below, and their possible values, see | |||
496 | Port to connect to on the remote host. | 495 | Port to connect to on the remote host. |
497 | This can be specified on a | 496 | This can be specified on a |
498 | per-host basis in the configuration file. | 497 | per-host basis in the configuration file. |
499 | .It Fl Q Ar cipher | Ar cipher-auth | Ar mac | Ar kex | Ar key | 498 | .It Fl Q Cm cipher | cipher-auth | mac | kex | key |
500 | Queries | 499 | Queries |
501 | .Nm | 500 | .Nm |
502 | for the algorithms supported for the specified version 2. | 501 | for the algorithms supported for the specified version 2. |
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssh.c,v 1.394 2013/11/25 18:04:21 deraadt Exp $ */ | 1 | /* $OpenBSD: ssh.c,v 1.395 2013/11/26 12:14:54 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 |
@@ -200,10 +200,10 @@ usage(void) | |||
200 | " [-D [bind_address:]port] [-E log_file] [-e escape_char]\n" | 200 | " [-D [bind_address:]port] [-E log_file] [-e escape_char]\n" |
201 | " [-F configfile] [-I pkcs11] [-i identity_file]\n" | 201 | " [-F configfile] [-I pkcs11] [-i identity_file]\n" |
202 | " [-L [bind_address:]port:host:hostport] [-l login_name] [-m mac_spec]\n" | 202 | " [-L [bind_address:]port:host:hostport] [-l login_name] [-m mac_spec]\n" |
203 | " [-O ctl_cmd] [-o option] [-p port] [-R [bind_address:]port:host:hostport]\n" | 203 | " [-O ctl_cmd] [-o option] [-p port]\n" |
204 | " [-S ctl_path] [-Q cipher | cipher-auth | mac | kex | key]\n" | 204 | " [-Q cipher | cipher-auth | mac | kex | key]\n" |
205 | " [-W host:port] [-w local_tun[:remote_tun]]\n" | 205 | " [-R [bind_address:]port:host:hostport] [-S ctl_path] [-W host:port]\n" |
206 | " [user@]hostname [command]\n" | 206 | " [-w local_tun[:remote_tun]] [user@]hostname [command]\n" |
207 | ); | 207 | ); |
208 | exit(255); | 208 | exit(255); |
209 | } | 209 | } |