From: djm@openbsd.org <djm@openbsd.org>
Date: Fri, 4 Sep 2015 04:47:50 +0000 (+0000)
Subject: upstream commit
X-Git-Tag: V_7_2_P1~200
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a954cdb799a4d83c2d40fbf3e7b9f187fbfd72fc;p=thirdparty%2Fopenssh-portable.git

upstream commit

better document ExitOnForwardFailure; bz#2444, ok
 dtucker@

Upstream-ID: a126209b5a6d9cb3117ac7ab5bc63d284538bfc2
---

diff --git a/ssh_config.5 b/ssh_config.5
index a47f3ca9e..d0625405f 100644
--- a/ssh_config.5
+++ b/ssh_config.5
@@ -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_config.5,v 1.215 2015/08/14 15:32:41 jmc Exp $
-.Dd $Mdocdate: August 14 2015 $
+.\" $OpenBSD: ssh_config.5,v 1.216 2015/09/04 04:47:50 djm Exp $
+.Dd $Mdocdate: September 4 2015 $
 .Dt SSH_CONFIG 5
 .Os
 .Sh NAME
@@ -639,7 +639,14 @@ data).
 Specifies whether
 .Xr ssh 1
 should terminate the connection if it cannot set up all requested
-dynamic, tunnel, local, and remote port forwardings.
+dynamic, tunnel, local, and remote port forwardings, (e.g.\&
+if either end is unable to bind and listen on a specified port.)
+Note that
+.Cm ExitOnForwardFailure
+does not apply to connections made over port forwardings and will not,
+for example, cause
+.Xr ssh 1
+to exit if TCP connections to the ultimate forwarding destination fail.
 The argument must be
 .Dq yes
 or