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

tests: fix recent test from using system klist

Browse Source 
Closes: #842
This commit is contained in:
Isaac Boukris
2021-10-07 15:36:14 +03:00
committed by Luke Howard
parent 3e466caf10
commit 7f8bb85cf5
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
tests/kdc/check-kdc.in
View File

@@ -93,6 +93,7 @@ rps="restricted-proxy-service@${R}"
aesenctype="aes256-cts-hmac-sha1-96" aesenctype="aes256-cts-hmac-sha1-96"
kinit="${kinit} -c $cache ${afs_no_afslog}" kinit="${kinit} -c $cache ${afs_no_afslog}"
klist2="${klist} -c $o2cache"
klist="${klist} -c $cache" klist="${klist} -c $cache"
kgetcred="${kgetcred} -c $cache" kgetcred="${kgetcred} -c $cache"
kgetcred_imp="${kgetcred} -c $cache --out-cache=${ocache}" kgetcred_imp="${kgetcred} -c $cache --out-cache=${ocache}"
@@ -872,7 +873,7 @@ ${kgetcred} \
--delegation-credential-cache=${ocache} \ --delegation-credential-cache=${ocache} \
${server}@${R} || \ ${server}@${R} || \
{ ec=1 ; eval "${testfailed}"; } { ec=1 ; eval "${testfailed}"; }
klist -c $o2cache | grep "Default principal: bar@${R}" || { ec=1 ; eval "${testfailed}"; } ${klist2} | grep "Principal: bar@${R}" || { ec=1 ; eval "${testfailed}"; }
echo " try using the credential" echo " try using the credential"
${test_ap_req} ${server}@${R} ${keytab} ${o2cache} || \ ${test_ap_req} ${server}@${R} ${keytab} ${o2cache} || \
{ ec=1 ; eval "${testfailed}"; } { ec=1 ; eval "${testfailed}"; }
@@ -895,7 +896,7 @@ ${kgetcred} \
--delegation-credential-cache=${ocache} \ --delegation-credential-cache=${ocache} \
${server}@${R} || \ ${server}@${R} || \
{ ec=1 ; eval "${testfailed}"; } { ec=1 ; eval "${testfailed}"; }
klist -c $o2cache | grep "Default principal: foo@${R2}" || { ec=1 ; eval "${testfailed}"; } ${klist2} | grep "Principal: foo@${R2}" || { ec=1 ; eval "${testfailed}"; }
echo " try using the credential" echo " try using the credential"
${test_ap_req} ${server}@${R} ${keytab} ${o2cache} || \ ${test_ap_req} ${server}@${R} ${keytab} ${o2cache} || \
{ ec=1 ; eval "${testfailed}"; } { ec=1 ; eval "${testfailed}"; }
@@ -937,7 +938,7 @@ ${kgetcred} \
--delegation-credential-cache=${ocache} \ --delegation-credential-cache=${ocache} \
${server}@${R} || \ ${server}@${R} || \
{ ec=1 ; eval "${testfailed}"; } { ec=1 ; eval "${testfailed}"; }
klist -c $o2cache | grep "Default principal: bar@${R}" || { ec=1 ; eval "${testfailed}"; } ${klist2} | grep "Principal: bar@${R}" || { ec=1 ; eval "${testfailed}"; }
${test_ap_req} ${server}@${R} ${keytab} ${o2cache} || \ ${test_ap_req} ${server}@${R} ${keytab} ${o2cache} || \
{ ec=1 ; eval "${testfailed}"; } { ec=1 ; eval "${testfailed}"; }