summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordlg <dlg@openbsd.org>2021-02-15 11:09:22 +0000
committerdlg <dlg@openbsd.org>2021-02-15 11:09:22 +0000
commit63664737a50be3b0f11623047d0929603c3b5096 (patch)
tree76dada226b76425b47c78a94f2ce5f3f34cdbbcb
parentSupport X11 colour names and some other variations for OSC 10/11, also (diff)
downloadwireguard-openbsd-63664737a50be3b0f11623047d0929603c3b5096.tar.xz
wireguard-openbsd-63664737a50be3b0f11623047d0929603c3b5096.zip
ProxyJump takes "none" to disable processing like ProxyCommand does
ok djm@ jmc@
-rw-r--r--usr.bin/ssh/ssh_config.57
1 files changed, 5 insertions, 2 deletions
diff --git a/usr.bin/ssh/ssh_config.5 b/usr.bin/ssh/ssh_config.5
index 6622c7230b6..29a199cbfe5 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.345 2021/01/26 15:40:17 naddy Exp $
-.Dd $Mdocdate: January 26 2021 $
+.\" $OpenBSD: ssh_config.5,v 1.346 2021/02/15 11:09:22 dlg Exp $
+.Dd $Mdocdate: February 15 2021 $
.Dt SSH_CONFIG 5
.Os
.Sh NAME
@@ -1371,6 +1371,9 @@ connection to the specified
.Cm ProxyJump
host and then establishing a
TCP forwarding to the ultimate target from there.
+Setting the host to
+.Cm none
+disables this option entirely.
.Pp
Note that this option will compete with the
.Cm ProxyCommand