summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2007-08-15 22:20:22 +1000
committerDarren Tucker <dtucker@zip.com.au>2007-08-15 22:20:22 +1000
commitfc5d188b34eb34a5c26c7430e563403bb36df5fb (patch)
treeacb331ed54b03cbe5880669db971266f89cbb350
parent9d81fdc664770594989cc9e8d0903c563a61698d (diff)
- stevesk@cvs.openbsd.org 2007/08/15 12:13:41
[ssh_config.5] tun device forwarding now honours ExitOnForwardFailure; ok markus@
-rw-r--r--ChangeLog5
-rw-r--r--ssh_config.56
2 files changed, 7 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index b71cbccf..56ecc293 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,9 @@
- markus@cvs.openbsd.org 2007/08/15 08:16:49
[version.h]
openssh 4.7
+ - stevesk@cvs.openbsd.org 2007/08/15 12:13:41
+ [ssh_config.5]
+ tun device forwarding now honours ExitOnForwardFailure; ok markus@
- (dtucker) [openbsd-compat/bsd-cray.c] Remove debug from signal handler.
ok djm@
- (dtucker) [README contrib/caldera/openssh.spec contrib/redhat/openssh.spec
@@ -3166,4 +3169,4 @@
OpenServer 6 and add osr5bigcrypt support so when someone migrates
passwords between UnixWare and OpenServer they will still work. OK dtucker@
-$Id: ChangeLog,v 1.4729 2007/08/15 09:22:20 dtucker Exp $
+$Id: ChangeLog,v 1.4730 2007/08/15 12:20:22 dtucker Exp $
diff --git a/ssh_config.5 b/ssh_config.5
index 2af08659..95af3976 100644
--- a/ssh_config.5
+++ b/ssh_config.5
@@ -34,8 +34,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.101 2007/06/08 07:43:46 jmc Exp $
-.Dd $Mdocdate: June 8 2007 $
+.\" $OpenBSD: ssh_config.5,v 1.102 2007/08/15 12:13:41 stevesk Exp $
+.Dd $Mdocdate: August 15 2007 $
.Dt SSH_CONFIG 5
.Os
.Sh NAME
@@ -387,7 +387,7 @@ data).
Specifies whether
.Xr ssh 1
should terminate the connection if it cannot set up all requested
-dynamic, local, and remote port forwardings.
+dynamic, tunnel, local, and remote port forwardings.
The argument must be
.Dq yes
or