1 files changed, 22 insertions, 6 deletions

diff --git a/regress/forwarding.sh b/regress/forwarding.sh
index f9c367beb..94873f22c 100644
--- a/regress/forwarding.sh
+++ b/regress/forwarding.sh
@@ -1,7 +1,8 @@
-#       $OpenBSD: forwarding.sh,v 1.8 2012/06/01 00:47:35 djm Exp $
+#       $OpenBSD: forwarding.sh,v 1.11 2013/06/10 21:56:43 dtucker Exp $
 #       Placed in the Public Domain.
 
 tid="local and remote forwarding"
+
 DATA=/bin/ls${EXEEXT}
 
 start_sshd
@@ -26,9 +27,9 @@ for p in 1 2; do
 
         trace "transfer over forwarded channels and check result"
         ${SSH} -$q -F $OBJ/ssh_config -p$last -o 'ConnectionAttempts=4' \
-                somehost cat $DATA > $OBJ/ls.copy
-        test -f $OBJ/ls.copy                    || fail "failed copy $DATA"
-        cmp $DATA $OBJ/ls.copy                  || fail "corrupted copy of $DATA"
+                somehost cat ${DATA} > ${COPY}
+        test -f ${COPY}         || fail "failed copy of ${DATA}"
+        cmp ${DATA} ${COPY}     || fail "corrupted copy of ${DATA}"
 
         sleep 10
 done
@@ -75,7 +76,7 @@ for p in 1 2; do
         else
                 # this one should fail
                 ${SSH} -$p -F $OBJ/ssh_config -p ${base}01 true \
-                     2>>$TEST_SSH_LOGFILE && \
+                     >>$TEST_REGRESS_LOGFILE 2>&1 && \
                         fail "local forwarding not cleared"
         fi
         sleep 10
@@ -88,7 +89,7 @@ for p in 1 2; do
         else
                 # this one should fail
                 ${SSH} -$p -F $OBJ/ssh_config -p ${base}01 true \
-                     2>>$TEST_SSH_LOGFILE && \
+                     >>$TEST_REGRESS_LOGFILE 2>&1 && \
                         fail "remote forwarding not cleared"
         fi
         sleep 10
@@ -103,3 +104,18 @@ for p in 2; do
                 fail "stdio forwarding proto $p"
         fi
 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
+        trace "config file: start forwarding, fork to background"
+        ${SSH} -$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' \
+                somehost cat ${DATA} > ${COPY}
+        test -f ${COPY}         || fail "failed copy of ${DATA}"
+        cmp ${DATA} ${COPY}     || fail "corrupted copy of ${DATA}"
+
+        wait
+done