From df0cc7d1b4944e2d45382e59b0b29fd4c5a4f745 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Love=20H=C3=B6rnquist=20=C3=85strand?= <lha@kth.se>
Date: Thu, 11 Dec 2008 05:10:51 +0000
Subject: [PATCH] use leaks-kill.sh

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@24165 ec53bebd-3082-4978-b11e-865c3cabbd6b
---
 tests/kdc/check-des.in      | 2 +-
 tests/kdc/check-kadmin.in   | 3 ++-
 tests/kdc/check-kpasswdd.in | 3 ++-
 tests/kdc/check-pkinit.in   | 2 +-
 tests/kdc/check-referral.in | 2 +-
 tests/kdc/check-uu.in       | 3 ++-
 6 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/tests/kdc/check-des.in b/tests/kdc/check-des.in
index 6741ab4af..f995f6ab7 100644
--- a/tests/kdc/check-des.in
+++ b/tests/kdc/check-des.in
@@ -137,7 +137,7 @@ ${klist} -v | grep des-cbc-crc > /dev/null || { ec=1 ; eval "${testfailed}"; }
 ${kdestroy}
 
 echo "killing kdc (${kdcpid})"
-kill $kdcpid || exit 1
+sh ${srcdir}/leaks-kill.sh kdc $kdcpid || exit 1
 
 trap "" EXIT
 
diff --git a/tests/kdc/check-kadmin.in b/tests/kdc/check-kadmin.in
index c621292e2..95a7a1d4e 100644
--- a/tests/kdc/check-kadmin.in
+++ b/tests/kdc/check-kadmin.in
@@ -225,7 +225,8 @@ cmp kadmin.tmp ${srcdir}/donotexists.txt || \
     { echo "wrong response"; exit 1;}
 
 echo "killing kdc (${kdcpid} ${kadmpid})"
-kill ${kdcpid} ${kadmpid} > /dev/null 2>/dev/null
+sh ${srcdir}/leaks-kill.sh kdc $kdcpid || exit 1
+sh ${srcdir}/leaks-kill.sh kadmind $kadmpid || exit 1
 
 trap "" EXIT
 
diff --git a/tests/kdc/check-kpasswdd.in b/tests/kdc/check-kpasswdd.in
index 6acaaabfd..279638be0 100644
--- a/tests/kdc/check-kpasswdd.in
+++ b/tests/kdc/check-kpasswdd.in
@@ -155,7 +155,8 @@ ${kdestroy}
 
 
 echo "killing kdc (${kdcpid} ${kpasswddpid})"
-kill $kdcpid $kpasswddpid || exit 1
+sh ${srcdir}/leaks-kill.sh kdc $kdcpid || exit 1
+sh ${srcdir}/leaks-kill.sh kpasswdd $kpasswddpid || exit 1
 
 trap "" EXIT
 
diff --git a/tests/kdc/check-pkinit.in b/tests/kdc/check-pkinit.in
index 05f645725..04a63fd8c 100644
--- a/tests/kdc/check-pkinit.in
+++ b/tests/kdc/check-pkinit.in
@@ -266,7 +266,7 @@ fi
 
 
 echo "killing kdc (${kdcpid})"
-kill $kdcpid || exit 1
+sh ${srcdir}/leaks-kill.sh kdc $kdcpid || exit 1
 
 trap "" EXIT
 
diff --git a/tests/kdc/check-referral.in b/tests/kdc/check-referral.in
index b726cdaeb..a8df9506a 100644
--- a/tests/kdc/check-referral.in
+++ b/tests/kdc/check-referral.in
@@ -191,7 +191,7 @@ ${kdestroy}
 
 
 echo "killing kdc (${kdcpid})"
-kill $kdcpid || exit 1
+sh ${srcdir}/leaks-kill.sh kdc $kdcpid || exit 1
 
 trap "" EXIT
 
diff --git a/tests/kdc/check-uu.in b/tests/kdc/check-uu.in
index ff629c082..941c7c61d 100644
--- a/tests/kdc/check-uu.in
+++ b/tests/kdc/check-uu.in
@@ -131,7 +131,8 @@ ${kdestroy1}
 ${kdestroy2}
 
 echo "killing kdc uu_server (${kdcpid} ${uuspid})"
-kill $kdcpid $uuspid || exit 1
+sh ${srcdir}/leaks-kill.sh kdc $kdcpid || exit 1
+
 
 trap "" EXIT