summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--regress/forwarding.sh20
1 files changed, 10 insertions, 10 deletions
diff --git a/regress/forwarding.sh b/regress/forwarding.sh
index b6d13ab72..60c37d896 100644
--- a/regress/forwarding.sh
+++ b/regress/forwarding.sh
@@ -1,4 +1,4 @@
1# $OpenBSD: forwarding.sh,v 1.18 2017/01/30 04:54:07 djm Exp $ 1# $OpenBSD: forwarding.sh,v 1.19 2017/01/30 05:22:14 djm Exp $
2# Placed in the Public Domain. 2# Placed in the Public Domain.
3 3
4tid="local and remote forwarding" 4tid="local and remote forwarding"
@@ -37,7 +37,7 @@ for p in ${SSH_PROTOCOLS}; do
37 test -s ${COPY} || fail "failed copy of ${DATA}" 37 test -s ${COPY} || fail "failed copy of ${DATA}"
38 cmp ${DATA} ${COPY} || fail "corrupted copy of ${DATA}" 38 cmp ${DATA} ${COPY} || fail "corrupted copy of ${DATA}"
39 39
40 ${SSH} -S $CTL -O exit somehost 40 ${SSH} -F $OBJ/ssh_config -S $CTL -O exit somehost
41done 41done
42 42
43for p in ${SSH_PROTOCOLS}; do 43for p in ${SSH_PROTOCOLS}; do
@@ -52,7 +52,7 @@ for d in L R; do
52 -$d ${base}04:127.0.0.1:$PORT \ 52 -$d ${base}04:127.0.0.1:$PORT \
53 -oExitOnForwardFailure=yes somehost true 53 -oExitOnForwardFailure=yes somehost true
54 if [ $? != 0 ]; then 54 if [ $? != 0 ]; then
55 fail "connection failed, should not" 55 fatal "connection failed, should not"
56 else 56 else
57 # this one should fail 57 # this one should fail
58 ${SSH} -q -$p -F $OBJ/ssh_config \ 58 ${SSH} -q -$p -F $OBJ/ssh_config \
@@ -86,7 +86,7 @@ for p in ${SSH_PROTOCOLS}; do
86 >>$TEST_REGRESS_LOGFILE 2>&1 && \ 86 >>$TEST_REGRESS_LOGFILE 2>&1 && \
87 fail "local forwarding not cleared" 87 fail "local forwarding not cleared"
88 fi 88 fi
89 ${SSH} -S $CTL -O exit somehost 89 ${SSH} -F $OBJ/ssh_config -S $CTL -O exit somehost
90 90
91 trace "clear remote forward proto $p" 91 trace "clear remote forward proto $p"
92 rm -f $CTL 92 rm -f $CTL
@@ -100,7 +100,7 @@ for p in ${SSH_PROTOCOLS}; do
100 >>$TEST_REGRESS_LOGFILE 2>&1 && \ 100 >>$TEST_REGRESS_LOGFILE 2>&1 && \
101 fail "remote forwarding not cleared" 101 fail "remote forwarding not cleared"
102 fi 102 fi
103 ${SSH} -S $CTL -O exit somehost 103 ${SSH} -F $OBJ/ssh_config -S $CTL -O exit somehost
104done 104done
105 105
106for p in 2; do 106for p in 2; do
@@ -126,7 +126,7 @@ for p in ${SSH_PROTOCOLS}; do
126 test -s ${COPY} || fail "failed copy of ${DATA}" 126 test -s ${COPY} || fail "failed copy of ${DATA}"
127 cmp ${DATA} ${COPY} || fail "corrupted copy of ${DATA}" 127 cmp ${DATA} ${COPY} || fail "corrupted copy of ${DATA}"
128 128
129 ${SSH} -S $CTL -O exit somehost 129 ${SSH} -F $OBJ/ssh_config -S $CTL -O exit somehost
130done 130done
131 131
132for p in 2; do 132for p in 2; do
@@ -142,8 +142,8 @@ for p in 2; do
142 test -s ${COPY} || fail "failed copy ${DATA}" 142 test -s ${COPY} || fail "failed copy ${DATA}"
143 cmp ${DATA} ${COPY} || fail "corrupted copy of ${DATA}" 143 cmp ${DATA} ${COPY} || fail "corrupted copy of ${DATA}"
144 144
145 ${SSH} -S $CTL -O exit somehost 145 ${SSH} -F $OBJ/ssh_config -S $CTL -O exit somehost
146 ${SSH} -S $CTL.1 -O exit somehost 146 ${SSH} -F $OBJ/ssh_config -S $CTL.1 -O exit somehost
147 ${SSH} -S $CTL.2 -O exit somehost 147 ${SSH} -F $OBJ/ssh_config -S $CTL.2 -O exit somehost
148 ${SSH} -S $CTL.3 -O exit somehost 148 ${SSH} -F $OBJ/ssh_config -S $CTL.3 -O exit somehost
149done 149done