From d57ec8f82badfe35bd86894ee6dacc4dffdae4d4 Mon Sep 17 00:00:00 2001 From: jmc Date: Sat, 16 Jul 2016 06:57:55 +0000 Subject: [PATCH] - add proxyjump to the options list - formatting fixes - update usage() ok djm --- usr.bin/ssh/scp.1 | 5 +++-- usr.bin/ssh/sftp.1 | 5 +++-- usr.bin/ssh/ssh.1 | 18 +++++++++--------- usr.bin/ssh/ssh.c | 11 ++++++----- usr.bin/ssh/ssh_config.5 | 11 +++++------ 5 files changed, 26 insertions(+), 24 deletions(-) diff --git a/usr.bin/ssh/scp.1 b/usr.bin/ssh/scp.1 index 3f5459089c3..4ae8777534a 100644 --- a/usr.bin/ssh/scp.1 +++ b/usr.bin/ssh/scp.1 @@ -8,9 +8,9 @@ .\" .\" Created: Sun May 7 00:14:37 1995 ylo .\" -.\" $OpenBSD: scp.1,v 1.70 2016/06/29 17:14:28 jmc Exp $ +.\" $OpenBSD: scp.1,v 1.71 2016/07/16 06:57:55 jmc Exp $ .\" -.Dd $Mdocdate: June 29 2016 $ +.Dd $Mdocdate: July 16 2016 $ .Dt SCP 1 .Os .Sh NAME @@ -172,6 +172,7 @@ For full details of the options listed below, and their possible values, see .It PreferredAuthentications .It Protocol .It ProxyCommand +.It ProxyJump .It PubkeyAcceptedKeyTypes .It PubkeyAuthentication .It RekeyLimit diff --git a/usr.bin/ssh/sftp.1 b/usr.bin/ssh/sftp.1 index ab8b186af85..fbdd00a1efd 100644 --- a/usr.bin/ssh/sftp.1 +++ b/usr.bin/ssh/sftp.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: sftp.1,v 1.104 2016/06/29 17:14:28 jmc Exp $ +.\" $OpenBSD: sftp.1,v 1.105 2016/07/16 06:57:55 jmc Exp $ .\" .\" Copyright (c) 2001 Damien Miller. All rights reserved. .\" @@ -22,7 +22,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. .\" -.Dd $Mdocdate: June 29 2016 $ +.Dd $Mdocdate: July 16 2016 $ .Dt SFTP 1 .Os .Sh NAME @@ -237,6 +237,7 @@ For full details of the options listed below, and their possible values, see .It PreferredAuthentications .It Protocol .It ProxyCommand +.It ProxyJump .It PubkeyAuthentication .It RekeyLimit .It RhostsRSAAuthentication diff --git a/usr.bin/ssh/ssh.1 b/usr.bin/ssh/ssh.1 index f3492b4d65c..4011c65aa66 100644 --- a/usr.bin/ssh/ssh.1 +++ b/usr.bin/ssh/ssh.1 @@ -33,8 +33,8 @@ .\" (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: ssh.1,v 1.375 2016/07/15 00:24:30 djm Exp $ -.Dd $Mdocdate: July 15 2016 $ +.\" $OpenBSD: ssh.1,v 1.376 2016/07/16 06:57:55 jmc Exp $ +.Dd $Mdocdate: July 16 2016 $ .Dt SSH 1 .Os .Sh NAME @@ -52,7 +52,7 @@ .Op Fl F Ar configfile .Op Fl I Ar pkcs11 .Op Fl i Ar identity_file -.Oo Fl J Ar user Ns @ Oc Ns Ar host Ns Op : Ns Ar port +.Op Fl J Oo Ar user Ns @ Oc Ns Ar host Ns Op : Ns Ar port .Op Fl L Ar address .Op Fl l Ar login_name .Op Fl m Ar mac_spec @@ -315,16 +315,16 @@ to identity filenames. .Pp .It Fl J Xo .Sm off -.Oo Ar jump_user @ Oc -.Ar jump_host -.Ns Op : Ns Ar jump_port +.Op Ar user No @ +.Ar host +.Op : Ar port .Sm on .Xc Connect to the target host by first making a .Nm -connection to -.Ar jump_host -and then establishing a TCP forward to the ultimate destination from +connection to the jump +.Ar host +and then establishing a TCP forwarding to the ultimate destination from there. Multiple jump hops may be specified separated by comma characters. This is a shortcut to specify a diff --git a/usr.bin/ssh/ssh.c b/usr.bin/ssh/ssh.c index e9d84adc1b4..b7dca7f0d00 100644 --- a/usr.bin/ssh/ssh.c +++ b/usr.bin/ssh/ssh.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssh.c,v 1.443 2016/07/15 00:24:30 djm Exp $ */ +/* $OpenBSD: ssh.c,v 1.444 2016/07/16 06:57:55 jmc Exp $ */ /* * Author: Tatu Ylonen * Copyright (c) 1995 Tatu Ylonen , Espoo, Finland @@ -183,10 +183,11 @@ usage(void) fprintf(stderr, "usage: ssh [-1246AaCfGgKkMNnqsTtVvXxYy] [-b bind_address] [-c cipher_spec]\n" " [-D [bind_address:]port] [-E log_file] [-e escape_char]\n" -" [-F configfile] [-I pkcs11] [-i identity_file] [-L address]\n" -" [-l login_name] [-m mac_spec] [-O ctl_cmd] [-o option] [-p port]\n" -" [-Q query_option] [-R address] [-S ctl_path] [-W host:port]\n" -" [-w local_tun[:remote_tun]] [user@]hostname [command]\n" +" [-F configfile] [-I pkcs11] [-i identity_file]\n" +" [-J [user@]host[:port]] [-L address] [-l login_name] [-m mac_spec]\n" +" [-O ctl_cmd] [-o option] [-p port] [-Q query_option] [-R address]\n" +" [-S ctl_path] [-W host:port] [-w local_tun[:remote_tun]]\n" +" [user@]hostname [command]\n" ); exit(255); } diff --git a/usr.bin/ssh/ssh_config.5 b/usr.bin/ssh/ssh_config.5 index 86057702391..56d7798cad6 100644 --- a/usr.bin/ssh/ssh_config.5 +++ b/usr.bin/ssh/ssh_config.5 @@ -33,8 +33,8 @@ .\" (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: ssh_config.5,v 1.233 2016/07/15 00:24:30 djm Exp $ -.Dd $Mdocdate: July 15 2016 $ +.\" $OpenBSD: ssh_config.5,v 1.234 2016/07/16 06:57:55 jmc Exp $ +.Dd $Mdocdate: July 16 2016 $ .Dt SSH_CONFIG 5 .Os .Sh NAME @@ -1362,9 +1362,9 @@ ProxyCommand /usr/bin/nc -X connect -x 192.0.2.0:8080 %h %p Specifies one or more jump proxies as .Xo .Sm off -.Oo Ar user @ Oc +.Op Ar user No @ .Ar host -.Ns Op : Ns Ar port +.Op : Ns Ar port .Sm on .Xc . Multiple proxies may be separated by comma characters. @@ -1375,13 +1375,12 @@ to connect to the target host by first making a connection to the specified .Cm ProxyJump host and then establishing a -a TCP forwarding to the ultimate target from there. +TCP forwarding to the ultimate target from there. .Pp Note that this option will compete with the .Cm ProxyCommand option - whichever is specified first will prevent later instances of the other from taking effect. -.Pp .It Cm ProxyUseFdpass Specifies that .Cm ProxyCommand -- 2.20.1