diff options
author | des <des@FreeBSD.org> | 2017-09-02 14:25:20 +0000 |
---|---|---|
committer | des <des@FreeBSD.org> | 2017-09-02 14:25:20 +0000 |
commit | ce0d6faba2a9fd27ff0fc0942a4e51f5203bb88f (patch) | |
tree | e29bf4f30ea560420ac21b41c62cc53b42547a0b /crypto/openssh/ssh.1 | |
parent | fa127d1375fbc969c65e8d8a5f9f2f8efe4e36fc (diff) | |
download | FreeBSD-src-ce0d6faba2a9fd27ff0fc0942a4e51f5203bb88f.zip FreeBSD-src-ce0d6faba2a9fd27ff0fc0942a4e51f5203bb88f.tar.gz |
MFH (r314527,r314576,r314601,r317998): Upgrade OpenSSH to 7.3p1.
Diffstat (limited to 'crypto/openssh/ssh.1')
-rw-r--r-- | crypto/openssh/ssh.1 | 33 |
1 files changed, 29 insertions, 4 deletions
diff --git a/crypto/openssh/ssh.1 b/crypto/openssh/ssh.1 index a434ab0..f5368c4 100644 --- a/crypto/openssh/ssh.1 +++ b/crypto/openssh/ssh.1 @@ -33,9 +33,9 @@ .\" (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 $ .\" $FreeBSD$ -.Dd $Mdocdate: February 17 2016 $ +.Dd $Mdocdate: July 16 2016 $ .Dt SSH 1 .Os .Sh NAME @@ -53,6 +53,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 @@ -313,6 +314,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. @@ -502,8 +521,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 @@ -522,6 +543,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 @@ -709,7 +731,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 |