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

Trap exit code from rkpty. Reported by John Center.

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@24730 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2009-02-16 18:37:16 +00:00
parent 96c5ea43fc
commit 90856e57b7
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
tests/kdc/check-kpasswdd.in
View File

@@ -38,7 +38,7 @@ srcdir="@srcdir@"
objdir="@objdir@" objdir="@objdir@"
EGREP="@EGREP@" EGREP="@EGREP@"
testfailed="echo test failed; cat messages.log; exit 1" testfailed="echo test failed; cat messages.log; exit \$ec"
# If there is no useful db support compile in, disable test # If there is no useful db support compile in, disable test
../db/have-db || exit 77 ../db/have-db || exit 77
@@ -62,6 +62,7 @@ klist="${TESTS_ENVIRONMENT} ../../kuser/klist -c $cache"
kgetcred="${TESTS_ENVIRONMENT} ../../kuser/kgetcred -c $cache" kgetcred="${TESTS_ENVIRONMENT} ../../kuser/kgetcred -c $cache"
kdestroy="${TESTS_ENVIRONMENT} ../../kuser/kdestroy -c $cache --no-unlog" kdestroy="${TESTS_ENVIRONMENT} ../../kuser/kdestroy -c $cache --no-unlog"
test_apreq="${TESTS_ENVIRONMENT} ../../lib/krb5/test_ap-req" test_apreq="${TESTS_ENVIRONMENT} ../../lib/krb5/test_ap-req"
rkpty="${TESTS_ENVIRONMENT} ../../lib/roken/rkpty"
KRB5_CONFIG="${objdir}/krb5.conf" KRB5_CONFIG="${objdir}/krb5.conf"
export KRB5_CONFIG export KRB5_CONFIG
@@ -103,7 +104,7 @@ echo Starting kpasswdd
${kpasswdd} & ${kpasswdd} &
kpasswddpid=$! kpasswddpid=$!
trap "kill ${kdcpid} ${kpasswddpid}; echo signal killing kdc; exit 1;" EXIT trap "kill ${kdcpid} ${kpasswddpid}; echo signal killing kdc; exit \$ec;" EXIT
ec=0 ec=0
@@ -132,8 +133,8 @@ send ${pw}\n
expect Success expect Success
EOF EOF
../../lib/roken/rkpty cpw.tmp ../../kpasswd/kpasswd foo@${R} || \ ${rkpty} cpw.tmp ../../kpasswd/kpasswd foo@${R} || \
{ ec=1 ; eval "${testfailed}"; } { ec=$? ; eval "${testfailed}"; }
rm cpw.tmp rm cpw.tmp
@@ -153,8 +154,6 @@ ${kdestroy}
echo "killing kdc (${kdcpid} ${kpasswddpid})" echo "killing kdc (${kdcpid} ${kpasswddpid})"
sh ${srcdir}/leaks-kill.sh kdc $kdcpid || exit 1 sh ${srcdir}/leaks-kill.sh kdc $kdcpid || exit 1
sh ${srcdir}/leaks-kill.sh kpasswdd $kpasswddpid || exit 1 sh ${srcdir}/leaks-kill.sh kpasswdd $kpasswddpid || exit 1