revert kt_default_name changes; see ChangeLogs for details

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@9407 dc483132-0cff-0310-8789-dd5450dbe970

1 files changed, 10 insertions, 14 deletions

diff --git a/src/kadmin/server/ovsec_kadmd.c b/src/kadmin/server/ovsec_kadmd.c
index 67aa77525b..21514aca1f 100644
--- a/src/kadmin/server/ovsec_kadmd.c
+++ b/src/kadmin/server/ovsec_kadmd.c
@@ -58,6 +58,13 @@ void *global_server_handle;
 #define OVSEC_KADM_ADMIN_SERVICE	"ovsec_adm/admin"
 #define OVSEC_KADM_CHANGEPW_SERVICE	"ovsec_adm/changepw"
 
+/*
+ * This enables us to set the keytab that gss_acquire_cred uses, but
+ * it also restricts us to linking against the Kv5 GSS-API library.
+ * Since this is *k*admind, that shouldn't be a problem.
+ */
+extern 	char *krb5_defkeyname;
+
 char *build_princ_name(char *name, char *realm);
 void log_badauth(OM_uint32 major, OM_uint32 minor,
 		 struct sockaddr_in *addr, char *data);
@@ -309,20 +316,9 @@ int main(int argc, char *argv[])
 	  exit(1);
      }
 
-     /*
-      * This enables us to set the keytab that gss_acquire_cred uses, but
-      * it also restricts us to linking against the Kv5 GSS-API library.
-      * Since this is *k*admind, that shouldn't be a problem.
-      */
-     if ((ret = krb5_kt_set_default_name(context, params.admin_keytab))) {
-         krb5_klog_syslog(LOG_ERR, "Cannot change default keytab name: %s",
-			  error_message(ret));
-         fprintf(stderr, "%s: Cannot change default keytab name.\n",
-		 whoami);
-	 kadm5_destroy(global_server_handle);
-	 krb5_klog_close();
-	 exit(1);
-     }
+     /* XXX krb5_defkeyname is an internal library global and should
+        go away */
+     krb5_defkeyname = params.admin_keytab;
 
      /*
       * Try to acquire creds for the old OV services as well as the