tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- dtucker@cvs.openbsd.org 2011/05/31 02:03:34 

[regress/dynamic-forward.sh]
     work around startup and teardown races; caught by deraadt
This commit is contained in:
Darren Tucker 2011-06-03 14:18:17 +10:00
parent 260c8fbc4d
commit 75e035c34e
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -26,6 +26,9 @@
- dtucker@cvs.openbsd.org 2011/05/31 02:01:58 - dtucker@cvs.openbsd.org 2011/05/31 02:01:58
[regress/dynamic-forward.sh] [regress/dynamic-forward.sh]
back out revs 1.6 and 1.5 since it's not reliable back out revs 1.6 and 1.5 since it's not reliable
- dtucker@cvs.openbsd.org 2011/05/31 02:03:34
[regress/dynamic-forward.sh]
work around startup and teardown races; caught by deraadt
20110529 20110529
- (djm) OpenBSD CVS Sync - (djm) OpenBSD CVS Sync

6
regress/dynamic-forward.sh
View File

@ -1,4 +1,4 @@
# $OpenBSD: dynamic-forward.sh,v 1.7 2011/05/31 02:01:58 dtucker Exp $ # $OpenBSD: dynamic-forward.sh,v 1.8 2011/05/31 02:03:34 dtucker Exp $
# Placed in the Public Domain. # Placed in the Public Domain.
tid="dynamic forwarding" tid="dynamic forwarding"
@ -21,7 +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"
${SSH} -$p -F $OBJ/ssh_config -f -D $FWDPORT -q somehost \ ${SSH} -$p -F $OBJ/ssh_config -f -D $FWDPORT -q \
-oExitOnForwardFailure=yes somehost \
exec sh -c \'"echo \$\$ > $OBJ/remote_pid; exec sleep 444"\' exec sh -c \'"echo \$\$ > $OBJ/remote_pid; exec sleep 444"\'
for s in 4 5; do for s in 4 5; do
@ -41,6 +42,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
sleep 1
else else
fail "no pid file: $OBJ/remote_pid" fail "no pid file: $OBJ/remote_pid"
fi fi