4 files changed, 4 insertions, 12 deletions
diff --git a/src/lib/krb5/libkrb5.exports b/src/lib/krb5/libkrb5.exports
index 28049e7879..3f2716a2fa 100644
--- a/src/lib/krb5/libkrb5.exports
+++ b/src/lib/krb5/libkrb5.exports
@@ -242,7 +242,6 @@ krb5_decode_ticket
 krb5_decrypt_tkt_part
 krb5_default_pwd_prompt1
 krb5_default_pwd_prompt2
-krb5_defkeyname
 krb5_deltat_to_string
 krb5_do_preauth
 krb5_encode_authdata_container
diff --git a/src/lib/krb5/os/ccdefname.c b/src/lib/krb5/os/ccdefname.c
index cb9bb7c938..a2d549da68 100644
--- a/src/lib/krb5/os/ccdefname.c
+++ b/src/lib/krb5/os/ccdefname.c
@@ -226,10 +226,8 @@ get_from_os(krb5_context context)
 static void
 get_from_os(krb5_context context)
 {
-    char *name;
-
-    if (asprintf(&name, "FILE:/tmp/krb5cc_%ld", (long)getuid()) >= 0)
-        context->os_context.default_ccname = name;
+    (void)k5_expand_path_tokens(context, DEFCCNAME,
+                                &context->os_context.default_ccname);
 }
 
 #endif /* not _WIN32 */
diff --git a/src/lib/krb5/os/ktdefname.c b/src/lib/krb5/os/ktdefname.c
index 93b28dd38c..ffbd14d519 100644
--- a/src/lib/krb5/os/ktdefname.c
+++ b/src/lib/krb5/os/ktdefname.c
@@ -29,8 +29,6 @@
 #include "k5-int.h"
 #include "os-proto.h"
 
-extern char *krb5_defkeyname;
-
 /* this is a an exceedinly gross thing. */
 char *krb5_overridekeyname = NULL;
 
@@ -54,7 +52,7 @@ kt_default_name(krb5_context context, char **name_out)
         profile_release_string(str);
         return ret;
     } else {
-        return k5_expand_path_tokens(context, krb5_defkeyname, name_out);
+        return k5_expand_path_tokens(context, DEFKTNAME, name_out);
     }
 }
 
@@ -75,8 +73,7 @@ k5_kt_client_default_name(krb5_context context, char **name_out)
         profile_release_string(str);
         return ret;
     } else {
-        return k5_expand_path_tokens(context, DEFAULT_CLIENT_KEYTAB_NAME,
-                                     name_out);
+        return k5_expand_path_tokens(context, DEFCKTNAME, name_out);
     }
 }
 
diff --git a/src/lib/krb5/os/osconfig.c b/src/lib/krb5/os/osconfig.c
index b6013c5cff..1f6be6fecc 100644
--- a/src/lib/krb5/os/osconfig.c
+++ b/src/lib/krb5/os/osconfig.c
@@ -35,8 +35,6 @@
 
 #include "k5-int.h"
 
-char *krb5_defkeyname  = DEFAULT_KEYTAB_NAME;
-
 unsigned int krb5_max_dgram_size = MAX_DGRAM_SIZE;
 
 const char *krb5_default_pwd_prompt1 = DEFAULT_PWD_STRING1;