krb5 commit: Allow full ccache name in k5test's K5Realm.klist

Greg Hudson ghudson at MIT.EDU
Wed Jul 11 15:35:27 EDT 2012


https://github.com/krb5/krb5/commit/904368745815bfed9cfd5a5c0916488d16a029fe
commit 904368745815bfed9cfd5a5c0916488d16a029fe
Author: Greg Hudson <ghudson at mit.edu>
Date:   Wed Jul 11 15:33:02 2012 -0400

    Allow full ccache name in k5test's K5Realm.klist

 src/util/k5test.py |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/src/util/k5test.py b/src/util/k5test.py
index b5f6d15..f771619 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.')


More information about the cvs-krb5 mailing list