From 6d7b0bfd17e060df1ae6a840dc72c76590b49664 Mon Sep 17 00:00:00 2001 From: Luke Howard Date: Sat, 22 Dec 2018 16:37:47 +1100 Subject: [PATCH] krb5: support default_ccache_name for MIT compat Allow default_ccache_name as an alias for default_cc_name in krb5.conf, for MIT compatibility (#355) --- lib/krb5/cache.c | 10 ++++++++++ lib/krb5/verify_krb5_conf.c | 1 + 2 files changed, 11 insertions(+) diff --git a/lib/krb5/cache.c b/lib/krb5/cache.c index 82feb4360..274dd8026 100644 --- a/lib/krb5/cache.c +++ b/lib/krb5/cache.c @@ -537,6 +537,16 @@ krb5_cc_set_default_name(krb5_context context, const char *name) return ret; } } + if (p == NULL) { + /* MIT compatibility */ + e = krb5_config_get_string(context, NULL, "libdefaults", + "default_ccache_name", NULL); + if (e) { + ret = _krb5_expand_default_cc_name(context, e, &p); + if (ret) + return ret; + } + } if (p == NULL) { e = krb5_config_get_string(context, NULL, "libdefaults", "default_cc_type", NULL); diff --git a/lib/krb5/verify_krb5_conf.c b/lib/krb5/verify_krb5_conf.c index 0db8807a4..7528f3f7b 100644 --- a/lib/krb5/verify_krb5_conf.c +++ b/lib/krb5/verify_krb5_conf.c @@ -389,6 +389,7 @@ struct entry libdefaults_entries[] = { { "clockskew", krb5_config_string, check_time, 0 }, { "date_format", krb5_config_string, NULL, 0 }, { "default_as_etypes", krb5_config_string, NULL, 0 }, + { "default_ccache_name", krb5_config_string, NULL, 0 }, { "default_cc_name", krb5_config_string, NULL, 0 }, { "default_cc_type", krb5_config_string, NULL, 0 }, { "default_etypes", krb5_config_string, NULL, 0 },