Use krb5_cc_ops->default_name to get the default name.

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@22104 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2007-12-03 17:17:41 +00:00
parent 804f92aa75
commit 8ff9a93093

View File

@@ -209,18 +209,7 @@ krb5_error_code KRB5_LIB_FUNCTION
krb5_cc_new_unique(krb5_context context, const char *type, krb5_cc_new_unique(krb5_context context, const char *type,
const char *hint, krb5_ccache *id) const char *hint, krb5_ccache *id)
{ {
const krb5_cc_ops *ops; const krb5_cc_ops *ops = KRB5_DEFAULT_CCTYPE;
if (type == NULL)
type = KRB5_DEFAULT_CCNAME;
ops = krb5_cc_get_prefix_ops(context, type);
if (ops == NULL) {
krb5_set_error_string(context, "Credential cache type %s is unknown",
type);
return KRB5_CC_UNKNOWN_TYPE;
}
return krb5_cc_gen_new(context, ops, id); return krb5_cc_gen_new(context, ops, id);
} }
@@ -431,11 +420,17 @@ krb5_cc_set_default_name(krb5_context context, const char *name)
if (e == NULL) { if (e == NULL) {
e = krb5_config_get_string(context, NULL, "libdefaults", e = krb5_config_get_string(context, NULL, "libdefaults",
"default_cc_name", NULL); "default_cc_name", NULL);
if (e == NULL) if (e) {
e = KRB5_DEFAULT_CCNAME; ret = _krb5_expand_default_cc_name(context, e, &p);
ret = _krb5_expand_default_cc_name(context, e, &p); if (ret)
if (ret) return ret;
return ret; }
if (e == NULL) {
const krb5_cc_ops *ops = KRB5_DEFAULT_CCTYPE;
ret = (*ops->default_name)(context, &p);
if (ret)
return ret;
}
} }
} else } else
p = strdup(name); p = strdup(name);