oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

check-iprop: don't fail to kill daemons

Browse Source
This commit is contained in:
Nicolas Williams
2017-01-19 11:07:45 -06:00
parent c7129a9562
commit 9ab5ffa3ba
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
tests/kdc/check-iprop.in
View File

@@ -432,12 +432,13 @@ wait_for_slave
echo "shutting down all services" echo "shutting down all services"
trap "" EXIT leaked=false
sh ${leaks_kill} kdc $kdcpid || exit 1 sh ${leaks_kill} kdc $kdcpid || leaked=true
sh ${leaks_kill} ipropd-master $ipdm || exit 1 sh ${leaks_kill} ipropd-master $ipdm || leaked=true
sh ${leaks_kill} ipropd-slave $ipds || exit 1 sh ${leaks_kill} ipropd-slave $ipds || leaked=true
rm -f iprop-slave-status rm -f iprop-slave-status
trap "" EXIT
$leaked && exit 1
echo "compare versions on master and slave logs" echo "compare versions on master and slave logs"
KRB5_CONFIG=${objdir}/krb5-slave.conf \ 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 # Sanity check that we have the same number of principals at the HDB
# and LMDB levels. # 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" echo "checking that principals in DB == entries in LMDB"
princs=`${kadmin} -l list '*' | wc -l` princs=`${kadmin} -l list '*' | wc -l`
entries=`mdb_stat -n current-db.mdb | grep 'Entries:' | awk '{print $2}'` entries=`mdb_stat -n current-db.mdb | grep 'Entries:' | awk '{print $2}'`