diff options
| author | Tom Yu <tlyu@mit.edu> | 2011-08-30 21:30:11 +0000 |
|---|---|---|
| committer | Tom Yu <tlyu@mit.edu> | 2011-08-30 21:30:11 +0000 |
| commit | 458c1bd81c13cd535a005406d3fa399e30b8c758 (patch) | |
| tree | 9657c0d1774f0985cd7c1e4cc26fb84d498ed4b2 | |
| parent | 9f27b012ad63b4d978ea7da62620bea551c4797f (diff) | |
| download | krb5-458c1bd81c13cd535a005406d3fa399e30b8c758.tar.gz krb5-458c1bd81c13cd535a005406d3fa399e30b8c758.tar.xz krb5-458c1bd81c13cd535a005406d3fa399e30b8c758.zip | |
Have kinit, klist and klist_keytab in k5test.realm take keyword args
Apply patch from Linus Nordberg.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@25119 dc483132-0cff-0310-8789-dd5450dbe970
| -rw-r--r-- | src/util/k5test.py | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/util/k5test.py b/src/util/k5test.py index 89551dde5..b22766380 100644 --- a/src/util/k5test.py +++ b/src/util/k5test.py @@ -859,28 +859,29 @@ class K5Realm(object): 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): |