From e857fe18945d933059a7ae5e38ce836ba3d822d0 Mon Sep 17 00:00:00 2001 From: Luke Howard Date: Thu, 13 Dec 2012 20:14:15 +0100 Subject: [PATCH] krb5_free_unparsed_name deprecated by Heimdal use krb5_xfree --- mech_eap/accept_sec_context.c | 11 ++++++----- mech_eap/util_name.c | 11 ++++++----- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/mech_eap/accept_sec_context.c b/mech_eap/accept_sec_context.c index e4f1ef5..6dfb9b7 100644 --- a/mech_eap/accept_sec_context.c +++ b/mech_eap/accept_sec_context.c @@ -387,12 +387,13 @@ setAcceptorIdentity(OM_uint32 *minor, PW_GSS_ACCEPTOR_SERVICE_SPECIFICS, 0, &nameBuf); - - if (GSS_ERROR(major)) { - krb5_free_unparsed_name(krbContext, ssi); - return major; - } +#ifdef HAVE_HEIMDAL_VERSION + krb5_xfree(ssi); +#else krb5_free_unparsed_name(krbContext, ssi); +#endif + if (GSS_ERROR(major)) + return major; } krbPrincRealmToGssBuffer(krbPrinc, &nameBuf); diff --git a/mech_eap/util_name.c b/mech_eap/util_name.c index 59e32ad..e60156c 100644 --- a/mech_eap/util_name.c +++ b/mech_eap/util_name.c @@ -752,12 +752,13 @@ gssEapDisplayName(OM_uint32 *minor, } major = makeStringBuffer(minor, krbName, output_name_buffer); - if (GSS_ERROR(major)) { - krb5_free_unparsed_name(krbContext, krbName); - return major; - } - +#ifdef HAVE_HEIMDAL_VERSION + krb5_xfree(krbName); +#else krb5_free_unparsed_name(krbContext, krbName); +#endif + if (GSS_ERROR(major)) + return major; if (output_name_buffer->length == 0) { name_type = GSS_C_NT_ANONYMOUS; -- 2.1.4