1 files changed, 7 insertions, 3 deletions
diff --git a/src/kadmin/cli/keytab.c b/src/kadmin/cli/keytab.c
index 8b291100ea..3a7867f46d 100644
--- a/src/kadmin/cli/keytab.c
+++ b/src/kadmin/cli/keytab.c
@@ -84,9 +84,7 @@ process_keytab(krb5_context my_context, char **keytab_str,
     char *name = *keytab_str;
 
     if (name == NULL) {
-        /* XXX krb5_defkeyname is an internal library global and
-           should go away */
-        name = strdup(krb5_defkeyname);
+        name = malloc(BUFSIZ);
         if (!name) {
             com_err(whoami, ENOMEM, "while creating keytab name");
             return 1;
@@ -97,6 +95,12 @@ process_keytab(krb5_context my_context, char **keytab_str,
             free(name);
             return 1;
         }
+        code = krb5_kt_get_name(my_context, *keytab, name, BUFSIZ);
+        if (code != 0) {
+            com_err(whoami, code, "while getting keytab name");
+            free(name);
+            return 1;
+        }
     } else {
         if (strchr(name, ':') != NULL)
             name = strdup(name);