From: Greg Hudson <ghudson@mit.edu>
Date: Mon, 5 Aug 2019 19:39:34 +0000 (-0400)
Subject: Clean up default ccache in dejagnu test suite
X-Git-Tag: krb5-1.18-beta1~80
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F964%2Fhead;p=thirdparty%2Fkrb5.git

Clean up default ccache in dejagnu test suite

The dejagnu test suite could fail due to a leftover tmpdir/tkt ccache
containing expired tickets.  Remove the ccache file along with the
keytab in delete_db.  (The file cpw_keytab, formerly written as
cpw_srvtab, is not used in the dejagnu tests and has not been used
going back to 1.0, so replace that removal with the removal of
tmpdir/tkt.)
---

diff --git a/src/tests/dejagnu/config/default.exp b/src/tests/dejagnu/config/default.exp
index d6e23e7171..93e2fb0f50 100644
--- a/src/tests/dejagnu/config/default.exp
+++ b/src/tests/dejagnu/config/default.exp
@@ -275,8 +275,8 @@ proc delete_db {} {
 	$tmppwd/kdc-db.ulog \
 	$tmppwd/replica-db $tmppwd/replica-db.ok $tmppwd/replica-db.kadm5 $tmppwd/replica-db.kadm5.lock \
 	$tmppwd/replica-db~ $tmppwd/replica-db~.ok $tmppwd/replica-db~.kadm5 $tmppwd/replica-db~.kadm5.lock
-    # Creating a new database means we need a new keytab.
-    file delete $tmppwd/keytab $tmppwd/cpw_keytab
+    # Creating a new database invalidates the keytab and ccache.
+    file delete $tmppwd/keytab $tmppwd/tkt
 }
 
 delete_db