From 89f59cea1c38ec2dea4e70d61603af8e2668dc94 Mon Sep 17 00:00:00 2001
From: Darren Tucker <dtucker@zip.com.au>
Date: Fri, 8 Sep 2006 00:03:05 +1000
Subject: [PATCH]  - (dtucker) [regress/cfgmatch.sh] stop_client is racy, so
 give us a better    chance of winning.

---
 ChangeLog           | 4 +++-
 regress/cfgmatch.sh | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index f6140fff5..9ec74d6c0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,8 @@
    exist on all the time, not just when UsePrivilegeSeparation=yes
  - (tim) [configure.ac] s/BROKEN_UPDWTMP/BROKEN_UPDWTMPX/ on SCO OSR6
  - (dtucker) [loginrec.c] Wrap paths.h in HAVE_PATHS_H.
+ - (dtucker) [regress/cfgmatch.sh] stop_client is racy, so give us a better
+   chance of winning.
 
 20060905
  - (dtucker) [configure.ac] s/AC_DEFINES/AC_DEFINE/ spotted by Roumen Petrov.
@@ -5408,4 +5410,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.4534 2006/09/07 12:57:53 dtucker Exp $
+$Id: ChangeLog,v 1.4535 2006/09/07 14:03:05 dtucker Exp $
diff --git a/regress/cfgmatch.sh b/regress/cfgmatch.sh
index 3a789faab..d987dcb97 100644
--- a/regress/cfgmatch.sh
+++ b/regress/cfgmatch.sh
@@ -12,6 +12,7 @@ stop_client()
 	pid=`cat $pidfile`
 	if [ ! -z "$pid" ]; then
 		kill $pid
+		sleep 1
 	fi
 }