oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

krb5: support default_ccache_name for MIT compat

Browse Source 
Allow default_ccache_name as an alias for default_cc_name in krb5.conf, for MIT
compatibility (#355)
This commit is contained in:
Luke Howard
2018-12-22 16:37:47 +11:00
parent 862133e2da
commit 6d7b0bfd17
2 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/krb5/cache.c
View File

@@ -537,6 +537,16 @@ krb5_cc_set_default_name(krb5_context context, const char *name)
return ret; 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) { if (p == NULL) {
e = krb5_config_get_string(context, NULL, "libdefaults", e = krb5_config_get_string(context, NULL, "libdefaults",
"default_cc_type", NULL); "default_cc_type", NULL);

1
lib/krb5/verify_krb5_conf.c
View File

@@ -389,6 +389,7 @@ struct entry libdefaults_entries[] = {
{ "clockskew", krb5_config_string, check_time, 0 }, { "clockskew", krb5_config_string, check_time, 0 },
{ "date_format", krb5_config_string, NULL, 0 }, { "date_format", krb5_config_string, NULL, 0 },
{ "default_as_etypes", 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_name", krb5_config_string, NULL, 0 },
{ "default_cc_type", krb5_config_string, NULL, 0 }, { "default_cc_type", krb5_config_string, NULL, 0 },
{ "default_etypes", krb5_config_string, NULL, 0 }, { "default_etypes", krb5_config_string, NULL, 0 },