diff options
author | Damien Miller <djm@cvs.openbsd.org> | 2018-05-11 04:01:12 +0000 |
---|---|---|
committer | Damien Miller <djm@cvs.openbsd.org> | 2018-05-11 04:01:12 +0000 |
commit | b8c0210147bb97c2a76e4697f97c244aef4e9ec6 (patch) | |
tree | af2a069cf90c537aea6eabab9300ef1d28a5da79 /usr.bin/ssh/ssh.1 | |
parent | 6eeed5fa6536a409a2030fcf474638969bdf9f8d (diff) |
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.
Diffstat (limited to 'usr.bin/ssh/ssh.1')
-rw-r--r-- | usr.bin/ssh/ssh.1 | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/usr.bin/ssh/ssh.1 b/usr.bin/ssh/ssh.1 index 82ec4a51ffb..40034463f48 100644 --- a/usr.bin/ssh/ssh.1 +++ b/usr.bin/ssh/ssh.1 @@ -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. |