From: Greg Hudson <ghudson@mit.edu>
Date: Wed, 11 Jul 2012 19:33:02 +0000 (-0400)
Subject: Allow full ccache name in k5test's K5Realm.klist
X-Git-Tag: krb5-1.11-alpha1~434
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=904368745815bfed9cfd5a5c0916488d16a029fe;p=thirdparty%2Fkrb5.git

Allow full ccache name in k5test's K5Realm.klist
---

diff --git a/src/util/k5test.py b/src/util/k5test.py
index b5f6d15100..f771619469 100644
--- a/src/util/k5test.py
+++ b/src/util/k5test.py
@@ -922,8 +922,11 @@ class K5Realm(object):
             service_princ = self.krbtgt_princ
         if ccache is None:
             ccache = self.ccache
+        ccachestr = ccache
+        if len(ccachestr) < 2 or ':' not in ccachestr[2:]:
+            ccachestr = 'FILE:' + ccachestr
         output = self.run_as_client([klist, ccache], **keywords)
-        if (('Ticket cache: FILE:%s\n' % ccache) not in output or
+        if (('Ticket cache: %s\n' % ccachestr) not in output or
             ('Default principal: %s\n' % client_princ) not in output or
             service_princ not in output):
             fail('Unexpected klist output.')