From 7f8bb85cf53b85a8b33143eb99c110bca96de254 Mon Sep 17 00:00:00 2001
From: Isaac Boukris <iboukris@gmail.com>
Date: Thu, 7 Oct 2021 15:36:14 +0300
Subject: [PATCH] tests: fix recent test from using system klist

Closes: #842
---
 tests/kdc/check-kdc.in | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/tests/kdc/check-kdc.in b/tests/kdc/check-kdc.in
index ba4f4ecce..503877769 100644
--- a/tests/kdc/check-kdc.in
+++ b/tests/kdc/check-kdc.in
@@ -93,6 +93,7 @@ rps="restricted-proxy-service@${R}"
 aesenctype="aes256-cts-hmac-sha1-96"
 
 kinit="${kinit} -c $cache ${afs_no_afslog}"
+klist2="${klist} -c $o2cache"
 klist="${klist} -c $cache"
 kgetcred="${kgetcred} -c $cache"
 kgetcred_imp="${kgetcred} -c $cache --out-cache=${ocache}"
@@ -872,7 +873,7 @@ ${kgetcred} \
 	--delegation-credential-cache=${ocache} \
 	${server}@${R} || \
 	{ 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"
 ${test_ap_req} ${server}@${R} ${keytab} ${o2cache} || \
 	{ ec=1 ; eval "${testfailed}"; }
@@ -895,7 +896,7 @@ ${kgetcred} \
 	--delegation-credential-cache=${ocache} \
 	${server}@${R} || \
 	{ 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"
 ${test_ap_req} ${server}@${R} ${keytab} ${o2cache} || \
 	{ ec=1 ; eval "${testfailed}"; }
@@ -937,7 +938,7 @@ ${kgetcred} \
 	--delegation-credential-cache=${ocache} \
 	${server}@${R} || \
 	{ 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} || \
 	{ ec=1 ; eval "${testfailed}"; }