- (djm) [regress/Makefile regress/agent-getpeereid.sh regress/cfgmatch.sh]

   [regress/cipher-speed.sh regress/forcecommand.sh regress/forwarding.sh]
   Sync regress tests to -current; include dtucker@'s new cfgmatch and
   forcecommand tests. Add cipher-speed.sh test (not linked in yet)

1 files changed, 31 insertions, 1 deletions

diff --git a/regress/forwarding.sh b/regress/forwarding.sh
index 3b171144f..9ffbb3dd4 100644
--- a/regress/forwarding.sh
+++ b/regress/forwarding.sh
@@ -1,4 +1,4 @@
-#       $OpenBSD: forwarding.sh,v 1.5 2005/03/10 10:20:39 dtucker Exp $
+#       $OpenBSD: forwarding.sh,v 1.6 2006/07/11 18:51:21 markus Exp $
 #       Placed in the Public Domain.
 
 tid="local and remote forwarding"
@@ -34,6 +34,36 @@ for p in 1 2; do
 done
 
 for p in 1 2; do
+for d in L R; do
+        trace "exit on -$d forward failure, proto $p"
+
+        # this one should succeed
+        ${SSH} -$p -F $OBJ/ssh_config \
+            -$d ${base}01:127.0.0.1:$PORT \
+            -$d ${base}02:127.0.0.1:$PORT \
+            -$d ${base}03:127.0.0.1:$PORT \
+            -$d ${base}04:127.0.0.1:$PORT \
+            -oExitOnForwardFailure=yes somehost true
+        if [ $? != 0 ]; then
+                fail "connection failed, should not"
+        else
+                # this one should fail
+                ${SSH} -q -$p -F $OBJ/ssh_config \
+                    -$d ${base}01:127.0.0.1:$PORT \
+                    -$d ${base}02:127.0.0.1:$PORT \
+                    -$d ${base}03:127.0.0.1:$PORT \
+                    -$d ${base}01:127.0.0.1:$PORT \
+                    -$d ${base}04:127.0.0.1:$PORT \
+                    -oExitOnForwardFailure=yes somehost true
+                r=$?
+                if [ $r != 255 ]; then
+                        fail "connection not termintated, but should ($r)"
+                fi
+        fi
+done
+done
+
+for p in 1 2; do
         trace "simple clear forwarding proto $p"
         ${SSH} -$p -F $OBJ/ssh_config -oClearAllForwardings=yes somehost true