summaryrefslogtreecommitdiff
path: root/ssh.1
diff options
context:
space:
mode:
authordjm@openbsd.org <djm@openbsd.org>2018-05-11 04:01:11 +0000
committerDamien Miller <djm@mindrot.org>2018-05-22 10:15:18 +1000
commitf18bc97151340127859634d20d79fd39ec8a7f39 (patch)
tree0c47c2fa7a9e86a5ba938a98d870a6d3ec3a4245 /ssh.1
parent32e4e94e1511fe0020fbfbb62399d31b2d22a801 (diff)
upstream: Emphasise that -w implicitly sets Tunnel=point-to-point
and that users should specify an explicit Tunnel directive if they don't want this. bz#2365. OpenBSD-Commit-ID: 1a8d9c67ae213ead180481900dbbb3e04864560d
Diffstat (limited to 'ssh.1')
-rw-r--r--ssh.111
1 files changed, 8 insertions, 3 deletions
diff --git a/ssh.1 b/ssh.1
index 82ec4a51f..40034463f 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.392 2018/04/06 03:34:27 djm Exp $ 36.\" $OpenBSD: ssh.1,v 1.393 2018/05/11 04:01:11 djm Exp $
37.Dd $Mdocdate: April 6 2018 $ 37.Dd $Mdocdate: May 11 2018 $
38.Dt SSH 1 38.Dt SSH 1
39.Os 39.Os
40.Sh NAME 40.Sh NAME
@@ -741,10 +741,15 @@ and
741.Cm TunnelDevice 741.Cm TunnelDevice
742directives in 742directives in
743.Xr ssh_config 5 . 743.Xr ssh_config 5 .
744.Pp
744If the 745If the
745.Cm Tunnel 746.Cm Tunnel
746directive is unset, it is set to the default tunnel mode, which is 747directive is unset, it will be set to the default tunnel mode, which is
747.Dq point-to-point . 748.Dq point-to-point .
749If a different
750.Cm Tunnel
751forwarding mode it desired, then it should be specified before
752.Fl w .
748.Pp 753.Pp
749.It Fl X 754.It Fl X
750Enables X11 forwarding. 755Enables X11 forwarding.