[25629] in CVS-changelog-for-Kerberos-V5
svn rev #25119: trunk/src/util/
daemon@ATHENA.MIT.EDU (tlyu@mit.edu)
Tue Aug 30 17:30:13 2011
Date: Tue, 30 Aug 2011 17:30:11 -0400
From: tlyu@mit.edu
Message-Id: <201108302130.p7ULUBxw004542@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
http://src.mit.edu/fisheye/changelog/krb5/?cs=25119
Commit By: tlyu
Log Message:
Have kinit, klist and klist_keytab in k5test.realm take keyword args.
Apply patch from Linus Nordberg.
Changed Files:
U trunk/src/util/k5test.py
Modified: trunk/src/util/k5test.py
===================================================================
--- trunk/src/util/k5test.py 2011-08-29 23:08:33 UTC (rev 25118)
+++ trunk/src/util/k5test.py 2011-08-30 21:30:11 UTC (rev 25119)
@@ -859,28 +859,29 @@
def extract_keytab(self, princname, keytab):
self.run_kadminl('ktadd -k %s -norandkey %s' % (keytab, princname))
- def kinit(self, princname, password=None, flags=[]):
+ def kinit(self, princname, password=None, flags=[], **keywords):
if password:
input = password + "\n"
else:
input = None
- self.run_as_client([kinit] + flags + [princname], input=input)
+ self.run_as_client([kinit] + flags + [princname], input=input,
+ **keywords)
- def klist(self, client_princ, service_princ=None, ccache=None):
+ def klist(self, client_princ, service_princ=None, ccache=None, **keywords):
if service_princ is None:
service_princ = self.krbtgt_princ
if ccache is None:
ccache = self.ccache
- output = self.run_as_client([klist, ccache])
+ output = self.run_as_client([klist, ccache], **keywords)
if (('Ticket cache: FILE:%s\n' % ccache) not in output or
('Default principal: %s\n' % client_princ) not in output or
service_princ not in output):
fail('Unexpected klist output.')
- def klist_keytab(self, princ, keytab=None):
+ def klist_keytab(self, princ, keytab=None, **keywords):
if keytab is None:
keytab = self.keytab
- output = self.run_as_client([klist, '-k', keytab])
+ output = self.run_as_client([klist, '-k', keytab], **keywords)
if (('Keytab name: FILE:%s\n' % keytab) not in output or
'KVNO Principal\n----' not in output or
princ not in output):
_______________________________________________
cvs-krb5 mailing list
cvs-krb5@mit.edu
https://mailman.mit.edu/mailman/listinfo/cvs-krb5
