diff options
author | Colin Watson <cjwatson@debian.org> | 2017-10-04 11:23:58 +0100 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2017-10-04 11:23:58 +0100 |
commit | 62f54f20bf351468e0124f63cc2902ee40d9b0e9 (patch) | |
tree | 3e090f2711b94ca5029d3fa3e8047b1ed1448b1f /regress/dynamic-forward.sh | |
parent | 6fabaf6fd9b07cc8bc6a17c9c4a5b76849cfc874 (diff) | |
parent | 66bf74a92131b7effe49fb0eefe5225151869dc5 (diff) |
Import openssh_7.6p1.orig.tar.gz
Diffstat (limited to 'regress/dynamic-forward.sh')
-rw-r--r-- | regress/dynamic-forward.sh | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/regress/dynamic-forward.sh b/regress/dynamic-forward.sh index dd67c9639..84f8ee192 100644 --- a/regress/dynamic-forward.sh +++ b/regress/dynamic-forward.sh | |||
@@ -1,4 +1,4 @@ | |||
1 | # $OpenBSD: dynamic-forward.sh,v 1.11 2015/03/03 22:35:19 markus Exp $ | 1 | # $OpenBSD: dynamic-forward.sh,v 1.13 2017/09/21 19:18:12 markus Exp $ |
2 | # Placed in the Public Domain. | 2 | # Placed in the Public Domain. |
3 | 3 | ||
4 | tid="dynamic forwarding" | 4 | tid="dynamic forwarding" |
@@ -17,33 +17,34 @@ trace "will use ProxyCommand $proxycmd" | |||
17 | 17 | ||
18 | start_sshd | 18 | start_sshd |
19 | 19 | ||
20 | for p in ${SSH_PROTOCOLS}; do | 20 | for d in D R; do |
21 | n=0 | 21 | n=0 |
22 | error="1" | 22 | error="1" |
23 | trace "start dynamic forwarding, fork to background" | 23 | trace "start dynamic forwarding, fork to background" |
24 | |||
24 | while [ "$error" -ne 0 -a "$n" -lt 3 ]; do | 25 | while [ "$error" -ne 0 -a "$n" -lt 3 ]; do |
25 | n=`expr $n + 1` | 26 | n=`expr $n + 1` |
26 | ${SSH} -$p -F $OBJ/ssh_config -f -D $FWDPORT -q \ | 27 | ${SSH} -F $OBJ/ssh_config -f -$d $FWDPORT -q \ |
27 | -oExitOnForwardFailure=yes somehost exec sh -c \ | 28 | -oExitOnForwardFailure=yes somehost exec sh -c \ |
28 | \'"echo \$\$ > $OBJ/remote_pid; exec sleep 444"\' | 29 | \'"echo \$\$ > $OBJ/remote_pid; exec sleep 444"\' |
29 | error=$? | 30 | error=$? |
30 | if [ "$error" -ne 0 ]; then | 31 | if [ "$error" -ne 0 ]; then |
31 | trace "forward failed proto $p attempt $n err $error" | 32 | trace "forward failed attempt $n err $error" |
32 | sleep $n | 33 | sleep $n |
33 | fi | 34 | fi |
34 | done | 35 | done |
35 | if [ "$error" -ne 0 ]; then | 36 | if [ "$error" -ne 0 ]; then |
36 | fatal "failed to start dynamic forwarding proto $p" | 37 | fatal "failed to start dynamic forwarding" |
37 | fi | 38 | fi |
38 | 39 | ||
39 | for s in 4 5; do | 40 | for s in 4 5; do |
40 | for h in 127.0.0.1 localhost; do | 41 | for h in 127.0.0.1 localhost; do |
41 | trace "testing ssh protocol $p socks version $s host $h" | 42 | trace "testing ssh socks version $s host $h (-$d)" |
42 | ${SSH} -F $OBJ/ssh_config \ | 43 | ${SSH} -F $OBJ/ssh_config \ |
43 | -o "ProxyCommand ${proxycmd}${s} $h $PORT" \ | 44 | -o "ProxyCommand ${proxycmd}${s} $h $PORT" \ |
44 | somehost cat $DATA > $OBJ/ls.copy | 45 | somehost cat ${DATA} > ${COPY} |
45 | test -f $OBJ/ls.copy || fail "failed copy $DATA" | 46 | test -f ${COPY} || fail "failed copy ${DATA}" |
46 | cmp $DATA $OBJ/ls.copy || fail "corrupted copy of $DATA" | 47 | cmp ${DATA} ${COPY} || fail "corrupted copy of ${DATA}" |
47 | done | 48 | done |
48 | done | 49 | done |
49 | 50 | ||
@@ -56,4 +57,5 @@ for p in ${SSH_PROTOCOLS}; do | |||
56 | else | 57 | else |
57 | fail "no pid file: $OBJ/remote_pid" | 58 | fail "no pid file: $OBJ/remote_pid" |
58 | fi | 59 | fi |
60 | |||
59 | done | 61 | done |