Trap exit code from rkpty. Reported by John Center.

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@24730 ec53bebd-3082-4978-b11e-865c3cabbd6b

tests/kdc/check-kpasswdd.in

@@ -38,7 +38,7 @@ srcdir="@srcdir@"
 objdir="@objdir@"
 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
 ../db/have-db || exit 77
@@ -62,6 +62,7 @@ klist="${TESTS_ENVIRONMENT} ../../kuser/klist -c $cache"
 kgetcred="${TESTS_ENVIRONMENT} ../../kuser/kgetcred -c $cache"
 kdestroy="${TESTS_ENVIRONMENT} ../../kuser/kdestroy -c $cache --no-unlog"
 test_apreq="${TESTS_ENVIRONMENT} ../../lib/krb5/test_ap-req"
+rkpty="${TESTS_ENVIRONMENT} ../../lib/roken/rkpty"
 
 KRB5_CONFIG="${objdir}/krb5.conf"
 export KRB5_CONFIG
@@ -103,7 +104,7 @@ echo Starting kpasswdd
 ${kpasswdd} &
 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
 
@@ -132,8 +133,8 @@ send ${pw}\n
 expect Success
 EOF
 
-../../lib/roken/rkpty cpw.tmp ../../kpasswd/kpasswd foo@${R} || \
-	{ ec=1 ; eval "${testfailed}"; }
+${rkpty} cpw.tmp ../../kpasswd/kpasswd foo@${R} || \
+	{ ec=$? ; eval "${testfailed}"; }
 
 rm cpw.tmp
 
@@ -153,8 +154,6 @@ ${kdestroy}
 
 
 
-
-
 echo "killing kdc (${kdcpid} ${kpasswddpid})"
 sh ${srcdir}/leaks-kill.sh kdc $kdcpid || exit 1
 sh ${srcdir}/leaks-kill.sh kpasswdd $kpasswddpid || exit 1