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

Put back code that was needed, move gen_new into new_unique.

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@22113 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2007-12-03 21:20:02 +00:00
parent 3556dc1513
commit 58a7d59b47
1 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
lib/krb5/cache.c
View File

@@ -185,12 +185,7 @@ krb5_cc_gen_new(krb5_context context,
const krb5_cc_ops *ops, const krb5_cc_ops *ops,
krb5_ccache *id) krb5_ccache *id)
{ {
krb5_error_code ret; return krb5_cc_new_unique(context, ops->prefix, NULL, id);
ret = _krb5_cc_allocate(context, ops, id);
if (ret)
return ret;
return (*id)->ops->gen_new(context, id);
} }
/** /**
@@ -210,7 +205,21 @@ 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 = KRB5_DEFAULT_CCTYPE; const krb5_cc_ops *ops = KRB5_DEFAULT_CCTYPE;
return krb5_cc_gen_new(context, ops, id); krb5_error_code ret;
if (type) {
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;
}
}
ret = _krb5_cc_allocate(context, ops, id);
if (ret)
return ret;
return (*id)->ops->gen_new(context, id);
} }
/** /**