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

krb5: Fix krb5_cc_get_name()

Browse Source
This commit is contained in:
Nicolas Williams
2020-05-28 00:39:34 -05:00
parent c976cbc0f0
commit 335d9a9f17
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
lib/krb5/cache.c
View File

@@ -487,7 +487,14 @@ KRB5_LIB_FUNCTION const char* KRB5_LIB_CALL
krb5_cc_get_name(krb5_context context,
krb5_ccache id)
{
return id->ops->get_name(context, id);
const char *name = NULL;
if (id->ops->version < KRB5_CC_OPS_VERSION_5
|| id->ops->get_name_2 == NULL)
return id->ops->get_name(context, id);
(void) id->ops->get_name_2(context, id, &name, NULL, NULL);
return name;
}
/**
@@ -500,17 +507,13 @@ krb5_cc_get_name(krb5_context context,
KRB5_LIB_FUNCTION const char* KRB5_LIB_CALL
krb5_cc_get_collection(krb5_context context, krb5_ccache id)
{
const char *name;
int ret;
const char *name = NULL;
if (id->ops->version < KRB5_CC_OPS_VERSION_5
|| id->ops->get_name_2 == NULL)
return NULL;
ret = id->ops->get_name_2(context, id, NULL, &name, NULL);
if (ret)
return NULL;
(void) id->ops->get_name_2(context, id, NULL, &name, NULL);
return name;
}