summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2006-09-08 00:03:05 +1000
committerDarren Tucker <dtucker@zip.com.au>2006-09-08 00:03:05 +1000
commit89f59cea1c38ec2dea4e70d61603af8e2668dc94 (patch)
treea376ffafa37b246977c8bf0a28277346d9699221
parentf19bbc38835acdc80b4c84e053afaf86f5dcb414 (diff)
- (dtucker) [regress/cfgmatch.sh] stop_client is racy, so give us a better
chance of winning.
-rw-r--r--ChangeLog4
-rw-r--r--regress/cfgmatch.sh1
2 files changed, 4 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index f6140fff5..9ec74d6c0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,8 @@
6 exist on all the time, not just when UsePrivilegeSeparation=yes 6 exist on all the time, not just when UsePrivilegeSeparation=yes
7 - (tim) [configure.ac] s/BROKEN_UPDWTMP/BROKEN_UPDWTMPX/ on SCO OSR6 7 - (tim) [configure.ac] s/BROKEN_UPDWTMP/BROKEN_UPDWTMPX/ on SCO OSR6
8 - (dtucker) [loginrec.c] Wrap paths.h in HAVE_PATHS_H. 8 - (dtucker) [loginrec.c] Wrap paths.h in HAVE_PATHS_H.
9 - (dtucker) [regress/cfgmatch.sh] stop_client is racy, so give us a better
10 chance of winning.
9 11
1020060905 1220060905
11 - (dtucker) [configure.ac] s/AC_DEFINES/AC_DEFINE/ spotted by Roumen Petrov. 13 - (dtucker) [configure.ac] s/AC_DEFINES/AC_DEFINE/ spotted by Roumen Petrov.
@@ -5408,4 +5410,4 @@
5408 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 5410 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
5409 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 5411 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
5410 5412
5411$Id: ChangeLog,v 1.4534 2006/09/07 12:57:53 dtucker Exp $ 5413$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()
12 pid=`cat $pidfile` 12 pid=`cat $pidfile`
13 if [ ! -z "$pid" ]; then 13 if [ ! -z "$pid" ]; then
14 kill $pid 14 kill $pid
15 sleep 1
15 fi 16 fi
16} 17}
17 18