krb5_free_unparsed_name deprecated by Heimdal
authorLuke Howard <lukeh@padl.com>
Thu, 13 Dec 2012 19:14:15 +0000 (20:14 +0100)
committerLuke Howard <lukeh@padl.com>
Thu, 13 Dec 2012 19:14:15 +0000 (20:14 +0100)
use krb5_xfree

mech_eap/accept_sec_context.c
mech_eap/util_name.c

index e4f1ef5..6dfb9b7 100644 (file)
@@ -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);
index 59e32ad..e60156c 100644 (file)
@@ -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;