From 9ab5ffa3babfe128aa1d51aaf6fab211bc709626 Mon Sep 17 00:00:00 2001
From: Nicolas Williams <nico@twosigma.com>
Date: Thu, 19 Jan 2017 11:07:45 -0600
Subject: [PATCH] check-iprop: don't fail to kill daemons

---
 tests/kdc/check-iprop.in | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/tests/kdc/check-iprop.in b/tests/kdc/check-iprop.in
index 1cc397c93..d1b48c2fb 100644
--- a/tests/kdc/check-iprop.in
+++ b/tests/kdc/check-iprop.in
@@ -432,12 +432,13 @@ wait_for_slave
 
 echo "shutting down all services"
 
-trap "" EXIT
-sh ${leaks_kill} kdc $kdcpid || exit 1
-sh ${leaks_kill} ipropd-master $ipdm || exit 1
-sh ${leaks_kill} ipropd-slave $ipds || exit 1
-
+leaked=false
+sh ${leaks_kill} kdc $kdcpid || leaked=true
+sh ${leaks_kill} ipropd-master $ipdm || leaked=true
+sh ${leaks_kill} ipropd-slave $ipds || leaked=true
 rm -f iprop-slave-status
+trap "" EXIT
+$leaked && exit 1
 
 echo "compare versions on master and slave logs"
 KRB5_CONFIG=${objdir}/krb5-slave.conf \
@@ -449,6 +450,9 @@ if [ "$db_type" = lmdb ]; then
     # Sanity check that we have the same number of principals at the HDB
     # and LMDB levels.
     #
+    # We should also do this for the sqlite backend, but that would
+    # require a sqlite3(1) shell that is capable of opening our HDB
+    # files.  W
     echo "checking that principals in DB == entries in LMDB"
     princs=`${kadmin} -l list '*' | wc -l`
     entries=`mdb_stat -n current-db.mdb | grep 'Entries:' | awk '{print $2}'`