diff options
-rw-r--r-- | scp.1 | 5 | ||||
-rw-r--r-- | sftp.1 | 5 | ||||
-rw-r--r-- | ssh.1 | 18 | ||||
-rw-r--r-- | ssh.c | 11 | ||||
-rw-r--r-- | ssh_config.5 | 11 |
5 files changed, 26 insertions, 24 deletions
@@ -8,9 +8,9 @@ | |||
8 | .\" | 8 | .\" |
9 | .\" Created: Sun May 7 00:14:37 1995 ylo | 9 | .\" Created: Sun May 7 00:14:37 1995 ylo |
10 | .\" | 10 | .\" |
11 | .\" $OpenBSD: scp.1,v 1.70 2016/06/29 17:14:28 jmc Exp $ | 11 | .\" $OpenBSD: scp.1,v 1.71 2016/07/16 06:57:55 jmc Exp $ |
12 | .\" | 12 | .\" |
13 | .Dd $Mdocdate: June 29 2016 $ | 13 | .Dd $Mdocdate: July 16 2016 $ |
14 | .Dt SCP 1 | 14 | .Dt SCP 1 |
15 | .Os | 15 | .Os |
16 | .Sh NAME | 16 | .Sh NAME |
@@ -172,6 +172,7 @@ For full details of the options listed below, and their possible values, see | |||
172 | .It PreferredAuthentications | 172 | .It PreferredAuthentications |
173 | .It Protocol | 173 | .It Protocol |
174 | .It ProxyCommand | 174 | .It ProxyCommand |
175 | .It ProxyJump | ||
175 | .It PubkeyAcceptedKeyTypes | 176 | .It PubkeyAcceptedKeyTypes |
176 | .It PubkeyAuthentication | 177 | .It PubkeyAuthentication |
177 | .It RekeyLimit | 178 | .It RekeyLimit |
@@ -1,4 +1,4 @@ | |||
1 | .\" $OpenBSD: sftp.1,v 1.104 2016/06/29 17:14:28 jmc Exp $ | 1 | .\" $OpenBSD: sftp.1,v 1.105 2016/07/16 06:57:55 jmc Exp $ |
2 | .\" | 2 | .\" |
3 | .\" Copyright (c) 2001 Damien Miller. All rights reserved. | 3 | .\" Copyright (c) 2001 Damien Miller. All rights reserved. |
4 | .\" | 4 | .\" |
@@ -22,7 +22,7 @@ | |||
22 | .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | 22 | .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
23 | .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 23 | .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
24 | .\" | 24 | .\" |
25 | .Dd $Mdocdate: June 29 2016 $ | 25 | .Dd $Mdocdate: July 16 2016 $ |
26 | .Dt SFTP 1 | 26 | .Dt SFTP 1 |
27 | .Os | 27 | .Os |
28 | .Sh NAME | 28 | .Sh NAME |
@@ -237,6 +237,7 @@ For full details of the options listed below, and their possible values, see | |||
237 | .It PreferredAuthentications | 237 | .It PreferredAuthentications |
238 | .It Protocol | 238 | .It Protocol |
239 | .It ProxyCommand | 239 | .It ProxyCommand |
240 | .It ProxyJump | ||
240 | .It PubkeyAuthentication | 241 | .It PubkeyAuthentication |
241 | .It RekeyLimit | 242 | .It RekeyLimit |
242 | .It RhostsRSAAuthentication | 243 | .It RhostsRSAAuthentication |
@@ -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.375 2016/07/15 00:24:30 djm Exp $ | 36 | .\" $OpenBSD: ssh.1,v 1.376 2016/07/16 06:57:55 jmc Exp $ |
37 | .Dd $Mdocdate: July 15 2016 $ | 37 | .Dd $Mdocdate: July 16 2016 $ |
38 | .Dt SSH 1 | 38 | .Dt SSH 1 |
39 | .Os | 39 | .Os |
40 | .Sh NAME | 40 | .Sh NAME |
@@ -52,7 +52,7 @@ | |||
52 | .Op Fl F Ar configfile | 52 | .Op Fl F Ar configfile |
53 | .Op Fl I Ar pkcs11 | 53 | .Op Fl I Ar pkcs11 |
54 | .Op Fl i Ar identity_file | 54 | .Op Fl i Ar identity_file |
55 | .Oo Fl J Ar user Ns @ Oc Ns Ar host Ns Op : Ns Ar port | 55 | .Op Fl J Oo Ar user Ns @ Oc Ns Ar host Ns Op : Ns Ar port |
56 | .Op Fl L Ar address | 56 | .Op Fl L Ar address |
57 | .Op Fl l Ar login_name | 57 | .Op Fl l Ar login_name |
58 | .Op Fl m Ar mac_spec | 58 | .Op Fl m Ar mac_spec |
@@ -315,16 +315,16 @@ to identity filenames. | |||
315 | .Pp | 315 | .Pp |
316 | .It Fl J Xo | 316 | .It Fl J Xo |
317 | .Sm off | 317 | .Sm off |
318 | .Oo Ar jump_user @ Oc | 318 | .Op Ar user No @ |
319 | .Ar jump_host | 319 | .Ar host |
320 | .Ns Op : Ns Ar jump_port | 320 | .Op : Ar port |
321 | .Sm on | 321 | .Sm on |
322 | .Xc | 322 | .Xc |
323 | Connect to the target host by first making a | 323 | Connect to the target host by first making a |
324 | .Nm | 324 | .Nm |
325 | connection to | 325 | connection to the jump |
326 | .Ar jump_host | 326 | .Ar host |
327 | and then establishing a TCP forward to the ultimate destination from | 327 | and then establishing a TCP forwarding to the ultimate destination from |
328 | there. | 328 | there. |
329 | Multiple jump hops may be specified separated by comma characters. | 329 | Multiple jump hops may be specified separated by comma characters. |
330 | This is a shortcut to specify a | 330 | This is a shortcut to specify a |
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssh.c,v 1.443 2016/07/15 00:24:30 djm Exp $ */ | 1 | /* $OpenBSD: ssh.c,v 1.444 2016/07/16 06:57:55 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 |
@@ -198,10 +198,11 @@ usage(void) | |||
198 | fprintf(stderr, | 198 | fprintf(stderr, |
199 | "usage: ssh [-1246AaCfGgKkMNnqsTtVvXxYy] [-b bind_address] [-c cipher_spec]\n" | 199 | "usage: ssh [-1246AaCfGgKkMNnqsTtVvXxYy] [-b bind_address] [-c cipher_spec]\n" |
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] [-L address]\n" | 201 | " [-F configfile] [-I pkcs11] [-i identity_file]\n" |
202 | " [-l login_name] [-m mac_spec] [-O ctl_cmd] [-o option] [-p port]\n" | 202 | " [-J [user@]host[:port]] [-L address] [-l login_name] [-m mac_spec]\n" |
203 | " [-Q query_option] [-R address] [-S ctl_path] [-W host:port]\n" | 203 | " [-O ctl_cmd] [-o option] [-p port] [-Q query_option] [-R address]\n" |
204 | " [-w local_tun[:remote_tun]] [user@]hostname [command]\n" | 204 | " [-S ctl_path] [-W host:port] [-w local_tun[:remote_tun]]\n" |
205 | " [user@]hostname [command]\n" | ||
205 | ); | 206 | ); |
206 | exit(255); | 207 | exit(255); |
207 | } | 208 | } |
diff --git a/ssh_config.5 b/ssh_config.5 index 860577023..56d7798ca 100644 --- a/ssh_config.5 +++ b/ssh_config.5 | |||
@@ -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_config.5,v 1.233 2016/07/15 00:24:30 djm Exp $ | 36 | .\" $OpenBSD: ssh_config.5,v 1.234 2016/07/16 06:57:55 jmc Exp $ |
37 | .Dd $Mdocdate: July 15 2016 $ | 37 | .Dd $Mdocdate: July 16 2016 $ |
38 | .Dt SSH_CONFIG 5 | 38 | .Dt SSH_CONFIG 5 |
39 | .Os | 39 | .Os |
40 | .Sh NAME | 40 | .Sh NAME |
@@ -1362,9 +1362,9 @@ ProxyCommand /usr/bin/nc -X connect -x 192.0.2.0:8080 %h %p | |||
1362 | Specifies one or more jump proxies as | 1362 | Specifies one or more jump proxies as |
1363 | .Xo | 1363 | .Xo |
1364 | .Sm off | 1364 | .Sm off |
1365 | .Oo Ar user @ Oc | 1365 | .Op Ar user No @ |
1366 | .Ar host | 1366 | .Ar host |
1367 | .Ns Op : Ns Ar port | 1367 | .Op : Ns Ar port |
1368 | .Sm on | 1368 | .Sm on |
1369 | .Xc . | 1369 | .Xc . |
1370 | Multiple proxies may be separated by comma characters. | 1370 | Multiple proxies may be separated by comma characters. |
@@ -1375,13 +1375,12 @@ to connect to the target host by first making a | |||
1375 | connection to the specified | 1375 | connection to the specified |
1376 | .Cm ProxyJump | 1376 | .Cm ProxyJump |
1377 | host and then establishing a | 1377 | host and then establishing a |
1378 | a TCP forwarding to the ultimate target from there. | 1378 | TCP forwarding to the ultimate target from there. |
1379 | .Pp | 1379 | .Pp |
1380 | Note that this option will compete with the | 1380 | Note that this option will compete with the |
1381 | .Cm ProxyCommand | 1381 | .Cm ProxyCommand |
1382 | option - whichever is specified first will prevent later instances of the | 1382 | option - whichever is specified first will prevent later instances of the |
1383 | other from taking effect. | 1383 | other from taking effect. |
1384 | .Pp | ||
1385 | .It Cm ProxyUseFdpass | 1384 | .It Cm ProxyUseFdpass |
1386 | Specifies that | 1385 | Specifies that |
1387 | .Cm ProxyCommand | 1386 | .Cm ProxyCommand |