summaryrefslogtreecommitdiff
path: root/ssh.1
diff options
context:
space:
mode:
authordtucker@openbsd.org <dtucker@openbsd.org>2016-06-03 04:09:38 +0000
committerDamien Miller <djm@mindrot.org>2016-06-08 11:39:31 +1000
commit0cb2f4c2494b115d0f346ed2d8b603ab3ba643f4 (patch)
tree541671083abd0311f6a5e1c8af47bf79cb6c8056 /ssh.1
parent8543ff3f5020fe659839b15f05b8c522bde6cee5 (diff)
downloadopenssh-git-0cb2f4c2494b115d0f346ed2d8b603ab3ba643f4.tar.gz
upstream commit
Allow ExitOnForwardFailure and ClearAllForwardings to be overridden when using ssh -W (but still default to yes in that case). bz#2577, ok djm@. Upstream-ID: 4b20c419e93ca11a861c81c284090cfabc8c54d4
Diffstat (limited to 'ssh.1')
-rw-r--r--ssh.19
1 files changed, 6 insertions, 3 deletions
diff --git a/ssh.1 b/ssh.1
index 9ed5a566..4c5ab215 100644
--- a/ssh.1
+++ b/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.371 2016/05/04 12:21:53 markus Exp $
-.Dd $Mdocdate: May 4 2016 $
+.\" $OpenBSD: ssh.1,v 1.372 2016/06/03 04:09:39 dtucker Exp $
+.Dd $Mdocdate: June 3 2016 $
.Dt SSH 1
.Os
.Sh NAME
@@ -709,7 +709,10 @@ Implies
.Fl T ,
.Cm ExitOnForwardFailure
and
-.Cm ClearAllForwardings .
+.Cm ClearAllForwardings
+although these can be overridden in the configuration file or
+.Fl o
+command line options.
.Pp
.It Fl w Xo
.Ar local_tun Ns Op : Ns Ar remote_tun