diff options
| author | Damien Miller <djm@cvs.openbsd.org> | 2017-01-30 05:22:15 +0000 |
|---|---|---|
| committer | Damien Miller <djm@cvs.openbsd.org> | 2017-01-30 05:22:15 +0000 |
| commit | 11b519cbebc617285662e67d1fe6b3497d54d674 (patch) | |
| tree | f38d991601f00fe86622451fbb4d1e529b09cfaf /regress/usr.bin/ssh | |
| parent | bb83e2c8b1fa60d9813cd6f422b7dbe0a60cefff (diff) | |
fully unbreak: some $SSH invocations did not have -F specified and
could pick up the ~/.ssh/config of the user running the tests
Diffstat (limited to 'regress/usr.bin/ssh')
| -rw-r--r-- | regress/usr.bin/ssh/forwarding.sh | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/regress/usr.bin/ssh/forwarding.sh b/regress/usr.bin/ssh/forwarding.sh index d7754e3b7a2..dd526eeeaa5 100644 --- a/regress/usr.bin/ssh/forwarding.sh +++ b/regress/usr.bin/ssh/forwarding.sh @@ -1,4 +1,4 @@ -# $OpenBSD: forwarding.sh,v 1.18 2017/01/30 04:54:07 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" @@ -35,7 +35,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 @@ -50,7 +50,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 \ @@ -84,7 +84,7 @@ for p in ${SSH_PROTOCOLS}; do >>$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 @@ -98,7 +98,7 @@ for p in ${SSH_PROTOCOLS}; do >>$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 @@ -124,7 +124,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 @@ -140,8 +140,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 |