From 2fa979aa62ae6fb4a258b0f600de82767c3a606f Mon Sep 17 00:00:00 2001 From: Sam Hartman Date: Mon, 19 May 2003 17:34:41 +0000 Subject: Register writable keytabs by default We have a customer requirement to support writable keytabs using the public API in 1.3 Discussion on krbcore indicates there is no good reason why these are not registered by default. So, they are now registered by default. Also adjust other code in the tree not to try and register them. Ticket: new Target_Version: 1.3 Component: krb5-libs Tags: pullup git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@15459 dc483132-0cff-0310-8789-dd5450dbe970 --- src/kadmin/cli/ChangeLog | 4 ++++ src/kadmin/cli/kadmin.c | 6 ------ 2 files changed, 4 insertions(+), 6 deletions(-) (limited to 'src/kadmin/cli') diff --git a/src/kadmin/cli/ChangeLog b/src/kadmin/cli/ChangeLog index aa463ba12..12c4a1671 100644 --- a/src/kadmin/cli/ChangeLog +++ b/src/kadmin/cli/ChangeLog @@ -1,3 +1,7 @@ +2003-05-19 Sam Hartman + + * kadmin.c (kadmin_startup): Don't register writable keytabs as this is always done by the library now. + 2003-02-07 Tom Yu * Makefile.in (install): Fix typo in k5srvutil.M install rule. diff --git a/src/kadmin/cli/kadmin.c b/src/kadmin/cli/kadmin.c index 189938e65..256537b28 100644 --- a/src/kadmin/cli/kadmin.c +++ b/src/kadmin/cli/kadmin.c @@ -175,7 +175,6 @@ char *kadmin_startup(argc, argv) int argc; char *argv[]; { - extern krb5_kt_ops krb5_ktf_writable_ops; extern char *optarg; char *princstr = NULL, *keytab_name = NULL, *query = NULL; char *password = NULL; @@ -449,11 +448,6 @@ char *kadmin_startup(argc, argv) } /* register the WRFILE keytab type and set it as the default */ - if ((retval = krb5_kt_register(context, &krb5_ktf_writable_ops))) { - com_err(whoami, retval, - "while registering writable key table functions"); - exit(1); - } { #define DEFAULT_KEYTAB "WRFILE:/etc/krb5.keytab" /* XXX krb5_defkeyname is an internal library global and -- cgit