summaryrefslogtreecommitdiffstats
path: root/src/util/k5test.py
diff options
context:
space:
mode:
authorGreg Hudson <ghudson@mit.edu>2012-07-11 15:33:02 -0400
committerGreg Hudson <ghudson@mit.edu>2012-07-11 15:33:02 -0400
commit904368745815bfed9cfd5a5c0916488d16a029fe (patch)
tree060e3eb64c73d48e8ef0172dc4dd68a0b15523dc /src/util/k5test.py
parentb700a332dd835affa78b60089b9de5c79a8c689e (diff)
downloadkrb5-904368745815bfed9cfd5a5c0916488d16a029fe.tar.gz
krb5-904368745815bfed9cfd5a5c0916488d16a029fe.tar.xz
krb5-904368745815bfed9cfd5a5c0916488d16a029fe.zip
Allow full ccache name in k5test's K5Realm.klist
Diffstat (limited to 'src/util/k5test.py')
-rw-r--r--src/util/k5test.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/util/k5test.py b/src/util/k5test.py
index b5f6d1510..f77161946 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.')