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
This commit is contained in:
djm@openbsd.org 2018-05-11 04:01:11 +00:00 committed by Damien Miller
parent 32e4e94e15
commit f18bc97151
1 changed files with 8 additions and 3 deletions

11
ssh.1
View File

@ -33,8 +33,8 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\" .\"
.\" $OpenBSD: ssh.1,v 1.392 2018/04/06 03:34:27 djm Exp $ .\" $OpenBSD: ssh.1,v 1.393 2018/05/11 04:01:11 djm Exp $
.Dd $Mdocdate: April 6 2018 $ .Dd $Mdocdate: May 11 2018 $
.Dt SSH 1 .Dt SSH 1
.Os .Os
.Sh NAME .Sh NAME
@ -741,10 +741,15 @@ and
.Cm TunnelDevice .Cm TunnelDevice
directives in directives in
.Xr ssh_config 5 . .Xr ssh_config 5 .
.Pp
If the If the
.Cm Tunnel .Cm Tunnel
directive is unset, it is set to the default tunnel mode, which is directive is unset, it will be set to the default tunnel mode, which is
.Dq point-to-point . .Dq point-to-point .
If a different
.Cm Tunnel
forwarding mode it desired, then it should be specified before
.Fl w .
.Pp .Pp
.It Fl X .It Fl X
Enables X11 forwarding. Enables X11 forwarding.