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/kadmin/cli | |
| 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/kadmin/cli')
| -rw-r--r-- | src/kadmin/cli/kadmin.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/src/kadmin/cli/kadmin.c b/src/kadmin/cli/kadmin.c index bf37bbedb..ecac1af4c 100644 --- a/src/kadmin/cli/kadmin.c +++ b/src/kadmin/cli/kadmin.c @@ -536,15 +536,6 @@ kadmin_startup(int argc, char *argv[]) exit(1); } - /* register the WRFILE keytab type and set it as the default */ - { -#define DEFAULT_KEYTAB "WRFILE:/etc/krb5.keytab" - /* XXX krb5_defkeyname is an internal library global and - should go away */ - extern char *krb5_defkeyname; - krb5_defkeyname = DEFAULT_KEYTAB; - } - retval = kadm5_init_iprop(handle, 0); if (retval) { com_err(whoami, retval, _("while mapping update log")); |