[26701] in CVS-changelog-for-Kerberos-V5
krb5 commit: Allow full ccache name in k5test's K5Realm.klist
daemon@ATHENA.MIT.EDU (Greg Hudson)
Wed Jul 11 15:35:31 2012
Date: Wed, 11 Jul 2012 15:35:27 -0400
From: Greg Hudson <ghudson@mit.edu>
Message-Id: <201207111935.q6BJZRKh010815@drugstore.mit.edu>
To: cvs-krb5@mit.edu
Reply-To: krbdev@mit.edu
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: cvs-krb5-bounces@mit.edu
https://github.com/krb5/krb5/commit/904368745815bfed9cfd5a5c0916488d16a029fe
commit 904368745815bfed9cfd5a5c0916488d16a029fe
Author: Greg Hudson <ghudson@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.')
_______________________________________________
cvs-krb5 mailing list
cvs-krb5@mit.edu
https://mailman.mit.edu/mailman/listinfo/cvs-krb5
