From d93ac2029864a788d67767af7d840267f371ece9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Love=20H=C3=B6rnquist=20=C3=85strand?= <lha@kth.se>
Date: Sun, 29 Mar 2009 09:03:47 +0000
Subject: [PATCH] kill -9 to make store its dead

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@24993 ec53bebd-3082-4978-b11e-865c3cabbd6b
---
 tests/kdc/check-cc.in         | 4 ++--
 tests/kdc/check-delegation.in | 4 ++--
 tests/kdc/check-des.in        | 4 ++--
 tests/kdc/check-digest.in     | 4 ++--
 tests/kdc/check-iprop.in      | 2 +-
 tests/kdc/check-kadmin.in     | 6 +++---
 tests/kdc/check-kdc.in        | 4 ++--
 tests/kdc/check-kpasswdd.in   | 4 ++--
 tests/kdc/check-pkinit.in     | 4 ++--
 tests/kdc/check-referral.in   | 4 ++--
 tests/kdc/check-uu.in         | 4 ++--
 11 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/tests/kdc/check-cc.in b/tests/kdc/check-cc.in
index 70d7d05e6..a32068d52 100644
--- a/tests/kdc/check-cc.in
+++ b/tests/kdc/check-cc.in
@@ -96,11 +96,11 @@ kdcpid=$!
 
 sh ${srcdir}/wait-kdc.sh
 if [ "$?" != 0 ] ; then
-    kill ${kdcpid}
+    kill -9 ${kdcpid}
     exit 1
 fi
 
-trap "kill ${kdcpid}; echo signal killing kdc; exit 1;" EXIT
+trap "kill -9 ${kdcpid}; echo signal killing kdc; exit 1;" EXIT
 
 ec=0
 
diff --git a/tests/kdc/check-delegation.in b/tests/kdc/check-delegation.in
index 789768f98..52239f7f3 100644
--- a/tests/kdc/check-delegation.in
+++ b/tests/kdc/check-delegation.in
@@ -109,11 +109,11 @@ kdcpid=$!
 
 sh ${srcdir}/wait-kdc.sh
 if [ "$?" != 0 ] ; then
-    kill ${kdcpid}
+    kill -9 ${kdcpid}
     exit 1
 fi
 
-trap "kill ${kdcpid}; echo signal killing kdc; exit 1;" EXIT
+trap "kill -9 ${kdcpid}; echo signal killing kdc; exit 1;" EXIT
 
 ec=0
 
diff --git a/tests/kdc/check-des.in b/tests/kdc/check-des.in
index 47a9d3f96..7620c0b04 100644
--- a/tests/kdc/check-des.in
+++ b/tests/kdc/check-des.in
@@ -102,11 +102,11 @@ kdcpid=$!
 
 sh ${srcdir}/wait-kdc.sh
 if [ "$?" != 0 ] ; then
-    kill ${kdcpid}
+    kill -9 ${kdcpid}
     exit 1
 fi
 
-trap "kill ${kdcpid}; echo signal killing kdc; exit 1;" EXIT
+trap "kill -9 ${kdcpid}; echo signal killing kdc; exit 1;" EXIT
 
 ec=0
 
diff --git a/tests/kdc/check-digest.in b/tests/kdc/check-digest.in
index cae3591be..b078a3903 100644
--- a/tests/kdc/check-digest.in
+++ b/tests/kdc/check-digest.in
@@ -103,11 +103,11 @@ kdcpid=$!
 
 sh ${srcdir}/wait-kdc.sh
 if [ "$?" != 0 ] ; then
-    kill ${kdcpid}
+    kill -9 ${kdcpid}
     exit 1
 fi
 
-trap "kill ${kdcpid}; echo signal killing kdc; cat messages.log; exit 1;" EXIT
+trap "kill -9 ${kdcpid}; echo signal killing kdc; cat messages.log; exit 1;" EXIT
 
 exitcode=0
 
diff --git a/tests/kdc/check-iprop.in b/tests/kdc/check-iprop.in
index f80f265d8..e7a62623a 100644
--- a/tests/kdc/check-iprop.in
+++ b/tests/kdc/check-iprop.in
@@ -94,7 +94,7 @@ ipdm=
 kdcpid=
 
 > iprop-stats
-trap "echo 'killing ipropd s + m + kdc'; kill \${ipdm} \${ipds} \${kdcpid} >/dev/null 2>/dev/null; tail messages.log ; tail iprop-stats; exit 1;" EXIT
+trap "echo 'killing ipropd s + m + kdc'; kill -9 \${ipdm} \${ipds} \${kdcpid} >/dev/null 2>/dev/null; tail messages.log ; tail iprop-stats; exit 1;" EXIT
 
 echo Starting kdc
 ${kdc} &
diff --git a/tests/kdc/check-kadmin.in b/tests/kdc/check-kadmin.in
index e2833d426..d3a766be9 100644
--- a/tests/kdc/check-kadmin.in
+++ b/tests/kdc/check-kadmin.in
@@ -91,12 +91,12 @@ kdcpid=$!
 
 sh ${srcdir}/wait-kdc.sh
 if [ "$?" != 0 ] ; then
-    kill ${kdcpid}
-    kill ${kadmpid}
+    kill -9 ${kdcpid}
+    kill -9 ${kadmpid}
     exit 1
 fi
 
-trap "kill ${kdcpid} ${kadmpid}" EXIT
+trap "kill -9 ${kdcpid} ${kadmpid}" EXIT
 
 #----------------------------------
 ${kadmind} -d &
diff --git a/tests/kdc/check-kdc.in b/tests/kdc/check-kdc.in
index a0b86c041..cdbac419d 100644
--- a/tests/kdc/check-kdc.in
+++ b/tests/kdc/check-kdc.in
@@ -165,11 +165,11 @@ kdcpid=$!
 
 sh ${srcdir}/wait-kdc.sh
 if [ "$?" != 0 ] ; then
-    kill ${kdcpid}
+    kill -9 ${kdcpid}
     exit 1
 fi
 
-trap "kill ${kdcpid}; echo signal killing kdc; exit 1;" EXIT
+trap "kill -9 ${kdcpid}; echo signal killing kdc; exit 1;" EXIT
 
 ec=0
 
diff --git a/tests/kdc/check-kpasswdd.in b/tests/kdc/check-kpasswdd.in
index 42a76a065..a1baaf06a 100644
--- a/tests/kdc/check-kpasswdd.in
+++ b/tests/kdc/check-kpasswdd.in
@@ -96,7 +96,7 @@ kdcpid=$!
 
 sh ${srcdir}/wait-kdc.sh
 if [ "$?" != 0 ] ; then
-    kill ${kdcpid}
+    kill -9 ${kdcpid}
     exit 1
 fi
 
@@ -104,7 +104,7 @@ echo Starting kpasswdd
 ${kpasswdd} &
 kpasswddpid=$!
 
-trap "kill ${kdcpid} ${kpasswddpid}; echo signal killing kdc; exit \$ec;" EXIT
+trap "kill -9 ${kdcpid} ${kpasswddpid}; echo signal killing kdc; exit \$ec;" EXIT
 
 ec=0
 
diff --git a/tests/kdc/check-pkinit.in b/tests/kdc/check-pkinit.in
index 04a63fd8c..bc3e9cfa4 100644
--- a/tests/kdc/check-pkinit.in
+++ b/tests/kdc/check-pkinit.in
@@ -167,11 +167,11 @@ kdcpid=$!
 
 sh ${srcdir}/wait-kdc.sh
 if [ "$?" != 0 ] ; then
-    kill ${kdcpid}
+    kill -9 ${kdcpid}
     exit 1
 fi
 
-trap "kill ${kdcpid}; echo signal killing kdc; cat ca.crt kdc.crt pkinit.crt ;exit 1;" EXIT
+trap "kill -9 ${kdcpid}; echo signal killing kdc; cat ca.crt kdc.crt pkinit.crt ;exit 1;" EXIT
 
 ec=0
 
diff --git a/tests/kdc/check-referral.in b/tests/kdc/check-referral.in
index 665395f13..387ed1f3c 100644
--- a/tests/kdc/check-referral.in
+++ b/tests/kdc/check-referral.in
@@ -103,11 +103,11 @@ kdcpid=$!
 
 sh ${srcdir}/wait-kdc.sh
 if [ "$?" != 0 ] ; then
-    kill ${kdcpid}
+    kill -9 ${kdcpid}
     exit 1
 fi
 
-trap "kill ${kdcpid}; echo signal killing kdc; exit 1;" EXIT
+trap "kill -9 ${kdcpid}; echo signal killing kdc; exit 1;" EXIT
 
 ec=0
 
diff --git a/tests/kdc/check-uu.in b/tests/kdc/check-uu.in
index 941c7c61d..9a9c31f58 100644
--- a/tests/kdc/check-uu.in
+++ b/tests/kdc/check-uu.in
@@ -93,11 +93,11 @@ kdcpid=$!
 
 sh ${srcdir}/wait-kdc.sh
 if [ "$?" != 0 ] ; then
-    kill ${kdcpid}
+    kill -9 ${kdcpid}
     exit 1
 fi
 
-trap "kill ${kdcpid} ${uuspid}; echo signal killing kdc; exit 1;" EXIT
+trap "kill -9 ${kdcpid} ${uuspid}; echo signal killing kdc; exit 1;" EXIT
 
 ec=0