diff options
author | markus@openbsd.org <markus@openbsd.org> | 2015-03-03 22:35:19 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2015-03-05 05:59:47 +1100 |
commit | dad2b1892b4c1b7e58df483a8c5b983c4454e099 (patch) | |
tree | fa461e273ef92414c934a88cc88b2875032e616f /regress/forwarding.sh | |
parent | d48a22601bdd3eec054794c535f4ae8d8ae4c6e2 (diff) |
upstream commit
make it possible to run tests w/o ssh1 support; ok djm@
Diffstat (limited to 'regress/forwarding.sh')
-rw-r--r-- | regress/forwarding.sh | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/regress/forwarding.sh b/regress/forwarding.sh index 0eee3176a..fb4f35aff 100644 --- a/regress/forwarding.sh +++ b/regress/forwarding.sh | |||
@@ -1,4 +1,4 @@ | |||
1 | # $OpenBSD: forwarding.sh,v 1.14 2015/02/23 20:32:15 djm Exp $ | 1 | # $OpenBSD: forwarding.sh,v 1.15 2015/03/03 22:35:19 markus Exp $ |
2 | # Placed in the Public Domain. | 2 | # Placed in the Public Domain. |
3 | 3 | ||
4 | tid="local and remote forwarding" | 4 | tid="local and remote forwarding" |
@@ -23,8 +23,11 @@ for j in 0 1 2; do | |||
23 | last=$a | 23 | last=$a |
24 | done | 24 | done |
25 | done | 25 | done |
26 | for p in 1 2; do | 26 | for p in ${SSH_PROTOCOLS}; do |
27 | q=`expr 3 - $p` | 27 | q=`expr 3 - $p` |
28 | if ! ssh_version $q; then | ||
29 | q=$p | ||
30 | fi | ||
28 | trace "start forwarding, fork to background" | 31 | trace "start forwarding, fork to background" |
29 | ${SSH} -$p -F $OBJ/ssh_config -f $fwd somehost sleep 10 | 32 | ${SSH} -$p -F $OBJ/ssh_config -f $fwd somehost sleep 10 |
30 | 33 | ||
@@ -37,7 +40,7 @@ for p in 1 2; do | |||
37 | sleep 10 | 40 | sleep 10 |
38 | done | 41 | done |
39 | 42 | ||
40 | for p in 1 2; do | 43 | for p in ${SSH_PROTOCOLS}; do |
41 | for d in L R; do | 44 | for d in L R; do |
42 | trace "exit on -$d forward failure, proto $p" | 45 | trace "exit on -$d forward failure, proto $p" |
43 | 46 | ||
@@ -67,7 +70,7 @@ for d in L R; do | |||
67 | done | 70 | done |
68 | done | 71 | done |
69 | 72 | ||
70 | for p in 1 2; do | 73 | for p in ${SSH_PROTOCOLS}; do |
71 | trace "simple clear forwarding proto $p" | 74 | trace "simple clear forwarding proto $p" |
72 | ${SSH} -$p -F $OBJ/ssh_config -oClearAllForwardings=yes somehost true | 75 | ${SSH} -$p -F $OBJ/ssh_config -oClearAllForwardings=yes somehost true |
73 | 76 | ||
@@ -110,7 +113,7 @@ done | |||
110 | 113 | ||
111 | echo "LocalForward ${base}01 127.0.0.1:$PORT" >> $OBJ/ssh_config | 114 | echo "LocalForward ${base}01 127.0.0.1:$PORT" >> $OBJ/ssh_config |
112 | echo "RemoteForward ${base}02 127.0.0.1:${base}01" >> $OBJ/ssh_config | 115 | echo "RemoteForward ${base}02 127.0.0.1:${base}01" >> $OBJ/ssh_config |
113 | for p in 1 2; do | 116 | for p in ${SSH_PROTOCOLS}; do |
114 | trace "config file: start forwarding, fork to background" | 117 | trace "config file: start forwarding, fork to background" |
115 | ${SSH} -S $CTL -M -$p -F $OBJ/ssh_config -f somehost sleep 10 | 118 | ${SSH} -S $CTL -M -$p -F $OBJ/ssh_config -f somehost sleep 10 |
116 | 119 | ||