diff options
| author |   dtucker <dtucker@openbsd.org> | 2011-05-31 02:01:58 +0000 |
|---|---|---|
| committer | dtucker <dtucker@openbsd.org> | 2011-05-31 02:01:58 +0000 |
| commit | c0d79c2ef7c7767a93cf3ee6589813c4f1265c72 (patch) | |
| tree | e0757b8948a113a0ce72041c4a5c4d62fbcf04e2 | |
| parent | Family 14h also supports the km(4) temperature sensor (diff) | |
| download | wireguard-openbsd-c0d79c2ef7c7767a93cf3ee6589813c4f1265c72.tar.xz wireguard-openbsd-c0d79c2ef7c7767a93cf3ee6589813c4f1265c72.zip | |
back out revs 1.6 and 1.5 since it's not reliable
| -rw-r--r-- | regress/usr.bin/ssh/dynamic-forward.sh | 23 |
1 files changed, 3 insertions, 20 deletions
diff --git a/regress/usr.bin/ssh/dynamic-forward.sh b/regress/usr.bin/ssh/dynamic-forward.sh index 0db079626d1..4be6bd93f8f 100644 --- a/regress/usr.bin/ssh/dynamic-forward.sh +++ b/regress/usr.bin/ssh/dynamic-forward.sh @@ -1,4 +1,4 @@ -# $OpenBSD: dynamic-forward.sh,v 1.6 2011/05/20 06:32:30 dtucker Exp $ +# $OpenBSD: dynamic-forward.sh,v 1.7 2011/05/31 02:01:58 dtucker Exp $ # Placed in the Public Domain. tid="dynamic forwarding" @@ -19,21 +19,8 @@ start_sshd for p in 1 2; do trace "start dynamic forwarding, fork to background" - rm -f $OBJ/remote_pid - ${SSH} -$p -F $OBJ/ssh_config -D $FWDPORT -q somehost \ - exec sh -c \'"echo \$\$ > $OBJ/remote_pid; exec sleep 444"\' & - client_pid=$! - - # Wait for ssh to start - n=0 - while test ! -f $OBJ/remote_pid; do - sleep 1 - n=`expr $n + 1` - if test $n -gt 60; then - kill $client_pid - fail "Timed out waiting for client to connect" - fi - done + ${SSH} -$p -F $OBJ/ssh_config -f -D $FWDPORT -q somehost \ + exec sh -c \'"echo \$\$ > $OBJ/remote_pid; exec sleep 444"\' for s in 4 5; do for h in 127.0.0.1 localhost; do @@ -52,11 +39,7 @@ for p in 1 2; do if [ $remote -gt 1 ]; then kill -HUP $remote fi - rm -f $OBJ/remote_pid else fail "no pid file: $OBJ/remote_pid" fi - - # Wait for listening ssh to terminate - wait done |