RepoMirrors
/
openssh
mirror of git://anongit.mindrot.org/openssh.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- dtucker@cvs.openbsd.org 2011/05/31 02:01:58 

[regress/dynamic-forward.sh]
     back out revs 1.6 and 1.5 since it's not reliable
This commit is contained in:
Darren Tucker 2011-06-03 14:17:27 +10:00
parent 3e78a516a0
commit 260c8fbc4d
2 changed files with 6 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -23,6 +23,9 @@
has exited, rather than attempting to send a zero signal, since the latter has exited, rather than attempting to send a zero signal, since the latter
won't work if the parent has changed privs. bz#1905, patch from Daniel Kahn won't work if the parent has changed privs. bz#1905, patch from Daniel Kahn
Gillmor, ok djm@ Gillmor, ok djm@
- dtucker@cvs.openbsd.org 2011/05/31 02:01:58
[regress/dynamic-forward.sh]
back out revs 1.6 and 1.5 since it's not reliable
20110529 20110529
- (djm) OpenBSD CVS Sync - (djm) OpenBSD CVS Sync

26
regress/dynamic-forward.sh
View File

@ -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. # Placed in the Public Domain.
tid="dynamic forwarding" tid="dynamic forwarding"
@ -21,21 +21,8 @@ start_sshd
for p in 1 2; do for p in 1 2; do
trace "start dynamic forwarding, fork to background" trace "start dynamic forwarding, fork to background"
rm -f $OBJ/remote_pid ${SSH} -$p -F $OBJ/ssh_config -f -D $FWDPORT -q somehost \
${SSH} -$p -F $OBJ/ssh_config -D $FWDPORT -q somehost \ exec sh -c \'"echo \$\$ > $OBJ/remote_pid; exec sleep 444"\'
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
for s in 4 5; do for s in 4 5; do
for h in 127.0.0.1 localhost; do for h in 127.0.0.1 localhost; do
@ -54,14 +41,7 @@ for p in 1 2; do
if [ $remote -gt 1 ]; then if [ $remote -gt 1 ]; then
kill -HUP $remote kill -HUP $remote
fi fi
rm -f $OBJ/remote_pid
else else
fail "no pid file: $OBJ/remote_pid" fail "no pid file: $OBJ/remote_pid"
fi fi
# Wait for listening ssh to terminate
wait
# Must allow time for connection tear-down
sleep 2
done done