Skip to content

Commit 2bdbdec

Browse files
committed
Do not wait on pid you are not a parent.
The zombi fix did too much modifications breaking the global time-out function. As the wait $pid failed, we no longer create the watchdog file. Fix by reverting unnecessary changes.
1 parent a2fdfb0 commit 2bdbdec

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

testssl.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17112,7 +17112,7 @@ run_renego() {
1711217112
for ((i=0; i < ssl_reneg_attempts; i++ )); do echo R; sleep $ssl_reneg_wait; done) | \
1711317113
$OPENSSL s_client $(s_client_options "$proto $legacycmd $STARTTLS $BUGS -connect $NODEIP:$PORT $PROXY $SNI") >$TMPFILE 2>>$ERRFILE &
1711417114
pid=$!
17115-
( sleep $(($ssl_reneg_attempts*3)) && pkill -HUP -P $pid && wait $pid && touch $TEMPDIR/was_killed ) >&2 2>/dev/null &
17115+
( sleep $(($ssl_reneg_attempts*3)) && kill $pid && touch $TEMPDIR/was_killed ) >&2 2>/dev/null &
1711617116
watcher=$!
1711717117
# Trick to get the return value of the openssl command, output redirection and a timeout. Yes, some target hang/block after some tries.
1711817118
wait $pid && pkill -HUP -P $watcher

0 commit comments

Comments
 (0)