1 files changed, 29 insertions, 4 deletions
diff --git a/ssh.1 b/ssh.1
index 7fb9d3040..6aa57c462 100644
--- a/ssh.1
+++ b/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.369 2016/02/17 07:38:19 jmc Exp $
+.\" $OpenBSD: ssh.1,v 1.376 2016/07/16 06:57:55 jmc Exp $
-.Dd $Mdocdate: February 17 2016 $
+.Dd $Mdocdate: July 16 2016 $
 .Dt SSH 1
 .Os
 .Sh NAME
@@ -52,6 +52,7 @@
 .Op Fl F Ar configfile
 .Op Fl I Ar pkcs11
 .Op Fl i Ar identity_file
+.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
@@ -312,6 +313,24 @@ by appending
 .Pa -cert.pub
 to identity filenames.
 .Pp
+.It Fl J Xo
+.Sm off
+.Op Ar user No @
+.Ar host
+.Op : Ar port
+.Sm on
+.Xc
+Connect to the target host by first making a
+.Nm
+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
+.Cm ProxyJump
+configuration directive.
+.Pp
 .It Fl K
 Enables GSSAPI-based authentication and forwarding (delegation) of GSSAPI
 credentials to the server.
@@ -501,8 +520,10 @@ For full details of the options listed below, and their possible values, see
 .It HostKeyAlgorithms
 .It HostKeyAlias
 .It HostName
-.It IdentityFile
 .It IdentitiesOnly
+.It IdentityAgent
+.It IdentityFile
+.It Include
 .It IPQoS
 .It KbdInteractiveAuthentication
 .It KbdInteractiveDevices
@@ -521,6 +542,7 @@ For full details of the options listed below, and their possible values, see
 .It PreferredAuthentications
 .It Protocol
 .It ProxyCommand
+.It ProxyJump
 .It ProxyUseFdpass
 .It PubkeyAcceptedKeyTypes
 .It PubkeyAuthentication
@@ -707,7 +729,10 @@ Implies
 .Fl T ,
 .Cm ExitOnForwardFailure
 and
-.Cm ClearAllForwardings .
+.Cm ClearAllForwardings ,
+though these can be overridden in the configuration file or using
+.Fl o
+command line options.
 .Pp
 .It Fl w Xo
 .Ar local_tun Ns Op : Ns Ar remote_tun

diff --git a/ssh.1 b/ssh.1 index 7fb9d3040..6aa57c462 100644 --- a/ssh.1 +++ b/ssh.1
@@ -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.369 2016/02/17 07:38:19 jmc Exp $	36	.\" $OpenBSD: ssh.1,v 1.376 2016/07/16 06:57:55 jmc Exp $
37	.Dd $Mdocdate: February 17 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,6 +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	.Op Fl J Oo Ar user Ns @ Oc Ns Ar host Ns Op : Ns Ar port
55	.Op Fl L Ar address	56	.Op Fl L Ar address
56	.Op Fl l Ar login_name	57	.Op Fl l Ar login_name
57	.Op Fl m Ar mac_spec	58	.Op Fl m Ar mac_spec
@@ -312,6 +313,24 @@ by appending
312	.Pa -cert.pub	313	.Pa -cert.pub
313	to identity filenames.	314	to identity filenames.
314	.Pp	315	.Pp
		316	.It Fl J Xo
		317	.Sm off
		318	.Op Ar user No @
		319	.Ar host
		320	.Op : Ar port
		321	.Sm on
		322	.Xc
		323	Connect to the target host by first making a
		324	.Nm
		325	connection to the jump
		326	.Ar host
		327	and then establishing a TCP forwarding to the ultimate destination from
		328	there.
		329	Multiple jump hops may be specified separated by comma characters.
		330	This is a shortcut to specify a
		331	.Cm ProxyJump
		332	configuration directive.
		333	.Pp
315	.It Fl K	334	.It Fl K
316	Enables GSSAPI-based authentication and forwarding (delegation) of GSSAPI	335	Enables GSSAPI-based authentication and forwarding (delegation) of GSSAPI
317	credentials to the server.	336	credentials to the server.
@@ -501,8 +520,10 @@ For full details of the options listed below, and their possible values, see
501	.It HostKeyAlgorithms	520	.It HostKeyAlgorithms
502	.It HostKeyAlias	521	.It HostKeyAlias
503	.It HostName	522	.It HostName
504	.It IdentityFile
505	.It IdentitiesOnly	523	.It IdentitiesOnly
		524	.It IdentityAgent
		525	.It IdentityFile
		526	.It Include
506	.It IPQoS	527	.It IPQoS
507	.It KbdInteractiveAuthentication	528	.It KbdInteractiveAuthentication
508	.It KbdInteractiveDevices	529	.It KbdInteractiveDevices
@@ -521,6 +542,7 @@ For full details of the options listed below, and their possible values, see
521	.It PreferredAuthentications	542	.It PreferredAuthentications
522	.It Protocol	543	.It Protocol
523	.It ProxyCommand	544	.It ProxyCommand
		545	.It ProxyJump
524	.It ProxyUseFdpass	546	.It ProxyUseFdpass
525	.It PubkeyAcceptedKeyTypes	547	.It PubkeyAcceptedKeyTypes
526	.It PubkeyAuthentication	548	.It PubkeyAuthentication
@@ -707,7 +729,10 @@ Implies
707	.Fl T ,	729	.Fl T ,
708	.Cm ExitOnForwardFailure	730	.Cm ExitOnForwardFailure
709	and	731	and
710	.Cm ClearAllForwardings .	732	.Cm ClearAllForwardings ,
		733	though these can be overridden in the configuration file or using
		734	.Fl o
		735	command line options.
711	.Pp	736	.Pp
712	.It Fl w Xo	737	.It Fl w Xo
713	.Ar local_tun Ns Op : Ns Ar remote_tun	738	.Ar local_tun Ns Op : Ns Ar remote_tun