diff options
| author | Greg Hudson <ghudson@mit.edu> | 2010-10-26 19:36:58 +0000 |
|---|---|---|
| committer | Greg Hudson <ghudson@mit.edu> | 2010-10-26 19:36:58 +0000 |
| commit | 1d239c143b1f0c82f792be4180402302ec790b0d (patch) | |
| tree | 8a4e60c88f4bb8f49644854975db1c7c6645da1b /src/util/k5test.py | |
| parent | 8c080710515d1d1acf6f6e989b6442be85ce7588 (diff) | |
| download | krb5-1d239c143b1f0c82f792be4180402302ec790b0d.tar.gz krb5-1d239c143b1f0c82f792be4180402302ec790b0d.tar.xz krb5-1d239c143b1f0c82f792be4180402302ec790b0d.zip | |
FILE keytabs have been able to handle write operations since krb5 1.7,
as an apparently unintended side effect of r20594. Clean up the code
by combining the identical resolve functions for FILE and WRFILE, and
removing the code to set up a WRFILE default keytab name in kadmin.c.
Also fixes a slight display bug; k5test.py needs to be adjusted to
expect the correct output.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@24487 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/util/k5test.py')
| -rw-r--r-- | src/util/k5test.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/util/k5test.py b/src/util/k5test.py index 8abac02f9..0efbc5d5b 100644 --- a/src/util/k5test.py +++ b/src/util/k5test.py @@ -878,7 +878,7 @@ class K5Realm(object): if keytab is None: keytab = self.keytab output = self.run_as_client([klist, '-k', keytab]) - if (('Keytab name: WRFILE:%s\n' % keytab) not in output or + if (('Keytab name: FILE:%s\n' % keytab) not in output or 'KVNO Principal\n----' not in output or princ not in output): fail('Unexpected klist output.') |