(gss_krb5_import_ccache): Use krb5_cc_get_full_name.
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@16275 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
@@ -115,18 +115,11 @@ gss_krb5_import_ccache(OM_uint32 *minor_status,
|
|||||||
}
|
}
|
||||||
|
|
||||||
{
|
{
|
||||||
const char *type, *name;
|
|
||||||
char *str;
|
char *str;
|
||||||
|
|
||||||
type = krb5_cc_get_type(gssapi_krb5_context, in);
|
kret = krb5_cc_get_full_name(gssapi_krb5_context, in, &str);
|
||||||
name = krb5_cc_get_name(gssapi_krb5_context, in);
|
if (kret)
|
||||||
|
|
||||||
if (asprintf(&str, "%s:%s", type, name) == -1) {
|
|
||||||
krb5_set_error_string(gssapi_krb5_context,
|
|
||||||
"malloc - out of memory");
|
|
||||||
kret = ENOMEM;
|
|
||||||
goto out;
|
goto out;
|
||||||
}
|
|
||||||
|
|
||||||
kret = krb5_cc_resolve(gssapi_krb5_context, str, &handle->ccache);
|
kret = krb5_cc_resolve(gssapi_krb5_context, str, &handle->ccache);
|
||||||
free(str);
|
free(str);
|
||||||
|
@@ -115,18 +115,11 @@ gss_krb5_import_ccache(OM_uint32 *minor_status,
|
|||||||
}
|
}
|
||||||
|
|
||||||
{
|
{
|
||||||
const char *type, *name;
|
|
||||||
char *str;
|
char *str;
|
||||||
|
|
||||||
type = krb5_cc_get_type(gssapi_krb5_context, in);
|
kret = krb5_cc_get_full_name(gssapi_krb5_context, in, &str);
|
||||||
name = krb5_cc_get_name(gssapi_krb5_context, in);
|
if (kret)
|
||||||
|
|
||||||
if (asprintf(&str, "%s:%s", type, name) == -1) {
|
|
||||||
krb5_set_error_string(gssapi_krb5_context,
|
|
||||||
"malloc - out of memory");
|
|
||||||
kret = ENOMEM;
|
|
||||||
goto out;
|
goto out;
|
||||||
}
|
|
||||||
|
|
||||||
kret = krb5_cc_resolve(gssapi_krb5_context, str, &handle->ccache);
|
kret = krb5_cc_resolve(gssapi_krb5_context, str, &handle->ccache);
|
||||||
free(str);
|
free(str);
|
||||||
|
Reference in New Issue
Block a user