From cb6ecdea6c56c21da4b9ba0612ce4a035ffe6417 Mon Sep 17 00:00:00 2001
From: Darren Tucker <dtucker@zip.com.au>
Date: Sat, 12 Nov 2005 21:30:07 +1100
Subject:  - (dtucker) [regress/reconfigure.sh] Fix potential race in the
 reconfigure    test: if sshd takes too long to reconfigure the subsequent
 connection will    fail.  Zap pidfile before HUPing sshd which will rewrite
 it when it's ready.

---
 ChangeLog              | 5 ++++-
 regress/reconfigure.sh | 5 +++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 102a8c0fc..b3eb526f6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,9 @@
  - (dtucker) [openbsd-compat/{realpath.c,stroll.c,rresvport.c}] $OpenBSD tag.
  - (dtucker) [configure.ac] Use "$AWK" instead of "awk" in gcc version test.
  - (dtucker) [configure.ac] Remove duplicate utimes() check.  ok djm@
+ - (dtucker) [regress/reconfigure.sh] Fix potential race in the reconfigure
+   test: if sshd takes too long to reconfigure the subsequent connection will
+   fail.  Zap pidfile before HUPing sshd which will rewrite it when it's ready.
 
 20051110
  - (dtucker) [openbsd-compat/setenv.c] Merge changes for __findenv from
@@ -3299,4 +3302,4 @@
    - (djm) Trim deprecated options from INSTALL. Mention UsePAM
    - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
 
-$Id: ChangeLog,v 1.3994 2005/11/12 07:42:36 dtucker Exp $
+$Id: ChangeLog,v 1.3995 2005/11/12 10:30:07 dtucker Exp $
diff --git a/regress/reconfigure.sh b/regress/reconfigure.sh
index ba6dbc6f5..1daf29f9a 100644
--- a/regress/reconfigure.sh
+++ b/regress/reconfigure.sh
@@ -15,8 +15,9 @@ esac
 
 start_sshd
 
-$SUDO kill -HUP `cat $PIDFILE`
-sleep 1
+PID=`cat $PIDFILE`
+rm -f $PIDFILE
+$SUDO kill -HUP $PID
 
 trace "wait for sshd to restart"
 i=0;
-- 
cgit v1.2.3