diff options
| author | djm@openbsd.org <djm@openbsd.org> | 2018-05-11 04:01:11 +0000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2018-05-22 10:15:18 +1000 |
| commit | f18bc97151340127859634d20d79fd39ec8a7f39 (patch) | |
| tree | 0c47c2fa7a9e86a5ba938a98d870a6d3ec3a4245 /ssh.1 | |
| parent | 32e4e94e1511fe0020fbfbb62399d31b2d22a801 (diff) | |
| download | openssh-git-f18bc97151340127859634d20d79fd39ec8a7f39.tar.gz | |
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.1 | 11 |
1 files changed, 8 insertions, 3 deletions
@@ -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.392 2018/04/06 03:34:27 djm Exp $ -.Dd $Mdocdate: April 6 2018 $ +.\" $OpenBSD: ssh.1,v 1.393 2018/05/11 04:01:11 djm Exp $ +.Dd $Mdocdate: May 11 2018 $ .Dt SSH 1 .Os .Sh NAME @@ -741,10 +741,15 @@ and .Cm TunnelDevice directives in .Xr ssh_config 5 . +.Pp If the .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 . +If a different +.Cm Tunnel +forwarding mode it desired, then it should be specified before +.Fl w . .Pp .It Fl X Enables X11 forwarding. |