1 files changed, 13 insertions, 14 deletions

diff --git a/regress/forwarding.sh b/regress/forwarding.sh
index 592de7bc3..45c596d7d 100644
--- a/regress/forwarding.sh
+++ b/regress/forwarding.sh
@@ -1,4 +1,4 @@
-#       $OpenBSD: forwarding.sh,v 1.16 2016/04/14 23:57:17 djm Exp $
+#       $OpenBSD: forwarding.sh,v 1.19 2017/01/30 05:22:14 djm Exp $
 #       Placed in the Public Domain.
 
 tid="local and remote forwarding"
@@ -10,8 +10,7 @@ start_sshd
 base=33
 last=$PORT
 fwd=""
-make_tmpdir
-CTL=$TMP/ctl-sock
+CTL=/tmp/openssh.regress.ctl-sock.$$
 
 for j in 0 1 2; do
         for i in 0 1 2; do
@@ -38,7 +37,7 @@ for p in ${SSH_PROTOCOLS}; do
         test -s ${COPY}         || fail "failed copy of ${DATA}"
         cmp ${DATA} ${COPY}     || fail "corrupted copy of ${DATA}"
 
-        ${SSH} -S $CTL -O exit somehost
+        ${SSH} -F $OBJ/ssh_config -S $CTL -O exit somehost
 done
 
 for p in ${SSH_PROTOCOLS}; do
@@ -53,7 +52,7 @@ for d in L R; do
             -$d ${base}04:127.0.0.1:$PORT \
             -oExitOnForwardFailure=yes somehost true
         if [ $? != 0 ]; then
-                fail "connection failed, should not"
+                fatal "connection failed, should not"
         else
                 # this one should fail
                 ${SSH} -q -$p -F $OBJ/ssh_config \
@@ -83,11 +82,11 @@ for p in ${SSH_PROTOCOLS}; do
                 fail "connection failed with cleared local forwarding"
         else
                 # this one should fail
-                ${SSH} -$p -F $OBJ/ssh_config -p ${base}01 true \
+                ${SSH} -$p -F $OBJ/ssh_config -p ${base}01 somehost true \
                      >>$TEST_REGRESS_LOGFILE 2>&1 && \
                         fail "local forwarding not cleared"
         fi
-        ${SSH} -S $CTL -O exit somehost
+        ${SSH} -F $OBJ/ssh_config -S $CTL -O exit somehost
         
         trace "clear remote forward proto $p"
         rm -f $CTL
@@ -97,11 +96,11 @@ for p in ${SSH_PROTOCOLS}; do
                 fail "connection failed with cleared remote forwarding"
         else
                 # this one should fail
-                ${SSH} -$p -F $OBJ/ssh_config -p ${base}01 true \
+                ${SSH} -$p -F $OBJ/ssh_config -p ${base}01 somehost true \
                      >>$TEST_REGRESS_LOGFILE 2>&1 && \
                         fail "remote forwarding not cleared"
         fi
-        ${SSH} -S $CTL -O exit somehost
+        ${SSH} -F $OBJ/ssh_config -S $CTL -O exit somehost
 done
 
 for p in 2; do
@@ -127,7 +126,7 @@ for p in ${SSH_PROTOCOLS}; do
         test -s ${COPY}         || fail "failed copy of ${DATA}"
         cmp ${DATA} ${COPY}     || fail "corrupted copy of ${DATA}"
 
-        ${SSH} -S $CTL -O exit somehost
+        ${SSH} -F $OBJ/ssh_config -S $CTL -O exit somehost
 done
 
 for p in 2; do
@@ -143,8 +142,8 @@ for p in 2; do
         test -s ${COPY}                 || fail "failed copy ${DATA}"
         cmp ${DATA} ${COPY}             || fail "corrupted copy of ${DATA}"
 
-        ${SSH} -S $CTL -O exit somehost
-        ${SSH} -S $CTL.1 -O exit somehost
-        ${SSH} -S $CTL.2 -O exit somehost
-        ${SSH} -S $CTL.3 -O exit somehost
+        ${SSH} -F $OBJ/ssh_config -S $CTL -O exit somehost
+        ${SSH} -F $OBJ/ssh_config -S $CTL.1 -O exit somehost
+        ${SSH} -F $OBJ/ssh_config -S $CTL.2 -O exit somehost
+        ${SSH} -F $OBJ/ssh_config -S $CTL.3 -O exit somehost
 done