From bde88e03ac15b94b001694d4f6ee2c99824bb656 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Love=20H=C3=B6rnquist=20=C3=85strand?= <lha@kth.se>
Date: Wed, 8 Aug 2007 06:53:04 +0000
Subject: [PATCH] Use wait-kdc.sh to wait for ipropd-{master,slave}.

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@21842 ec53bebd-3082-4978-b11e-865c3cabbd6b
---
 tests/kdc/check-iprop.in | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/tests/kdc/check-iprop.in b/tests/kdc/check-iprop.in
index 47614ad71..f561c4324 100644
--- a/tests/kdc/check-iprop.in
+++ b/tests/kdc/check-iprop.in
@@ -97,24 +97,20 @@ echo Starting kdc
 ${kdc} &
 kdcpid=$!
 
-sh ${srcdir}/wait-kdc.sh
-if [ "$?" != 0 ] ; then
-    kill ${kdcpid}
-    exit 1
-fi
+sh ${srcdir}/wait-kdc.sh || exit 1
 
 echo "starting master"
 ${ipropdmaster} --hostname=localhost -k ${keytab} \
     --database=${objdir}/current-db &
 ipdm=$!
-sleep 4
+sh ${srcdir}/wait-kdc.sh ipropd-master || exit 1
 
 echo "starting slave"
 KRB5_CONFIG="${objdir}/krb5-slave.conf" \
 ${ipropdslave} --hostname=slave -k ${keytab} localhost &
 ipds=$!
+sh ${srcdir}/wait-kdc.sh ipropd-slave || exit 1
 
-sleep 4
 echo "checking slave is up"
 ${EGREP} 'iprop/slave@TEST.H5L.SE.*Up' iprop-stats >/dev/null || exit 1