1 files changed, 13 insertions, 7 deletions

diff --git a/regress/forwarding.sh b/regress/forwarding.sh
index f799d4951..fb4f35aff 100644
--- a/regress/forwarding.sh
+++ b/regress/forwarding.sh
@@ -1,4 +1,4 @@
-#       $OpenBSD: forwarding.sh,v 1.12 2014/07/15 15:54:15 millert Exp $
+#       $OpenBSD: forwarding.sh,v 1.15 2015/03/03 22:35:19 markus Exp $
 #       Placed in the Public Domain.
 
 tid="local and remote forwarding"
@@ -10,6 +10,9 @@ start_sshd
 base=33
 last=$PORT
 fwd=""
+CTL=$OBJ/ctl-sock
+rm -f $CTL
+
 for j in 0 1 2; do
         for i in 0 1 2; do
                 a=$base$j$i
@@ -20,8 +23,11 @@ for j in 0 1 2; do
                 last=$a
         done
 done
-for p in 1 2; do
+for p in ${SSH_PROTOCOLS}; do
         q=`expr 3 - $p`
+        if ! ssh_version $q; then
+                q=$p
+        fi
         trace "start forwarding, fork to background"
         ${SSH} -$p -F $OBJ/ssh_config -f $fwd somehost sleep 10
 
@@ -34,7 +40,7 @@ for p in 1 2; do
         sleep 10
 done
 
-for p in 1 2; do
+for p in ${SSH_PROTOCOLS}; do
 for d in L R; do
         trace "exit on -$d forward failure, proto $p"
 
@@ -64,7 +70,7 @@ for d in L R; do
 done
 done
 
-for p in 1 2; do
+for p in ${SSH_PROTOCOLS}; do
         trace "simple clear forwarding proto $p"
         ${SSH} -$p -F $OBJ/ssh_config -oClearAllForwardings=yes somehost true
 
@@ -107,9 +113,9 @@ done
 
 echo "LocalForward ${base}01 127.0.0.1:$PORT" >> $OBJ/ssh_config
 echo "RemoteForward ${base}02 127.0.0.1:${base}01" >> $OBJ/ssh_config
-for p in 1 2; do
+for p in ${SSH_PROTOCOLS}; do
         trace "config file: start forwarding, fork to background"
-        ${SSH} -$p -F $OBJ/ssh_config -f somehost sleep 10
+        ${SSH} -S $CTL -M -$p -F $OBJ/ssh_config -f somehost sleep 10
 
         trace "config file: transfer over forwarded channels and check result"
         ${SSH} -F $OBJ/ssh_config -p${base}02 -o 'ConnectionAttempts=4' \
@@ -117,7 +123,7 @@ for p in 1 2; do
         test -s ${COPY}         || fail "failed copy of ${DATA}"
         cmp ${DATA} ${COPY}     || fail "corrupted copy of ${DATA}"
 
-        wait
+        ${SSH} -S $CTL -O exit somehost
 done
 
 for p in 2; do