Merge remote-tracking branch 'origin/master' into debian

diff --git a/mech_eap/accept_sec_context.c b/mech_eap/accept_sec_context.c
index e4f1ef5..6dfb9b7 100644 (file)
--- 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/init_sec_context.c b/mech_eap/init_sec_context.c
index 2354a38..05734d4 100644 (file)
--- a/mech_eap/init_sec_context.c
+++ b/mech_eap/init_sec_context.c
@@ -589,10 +589,10 @@ eapGssSmInitAcceptorName(OM_uint32 *minor,
             gssEapReleaseName(&tmpMinor, &nameHint);
 
             if (!equal) {
-             *minor = GSSEAP_WRONG_ACCEPTOR_NAME;
+                *minor = GSSEAP_WRONG_ACCEPTOR_NAME;
                 return GSS_S_DEFECTIVE_TOKEN;
             }
-        } else {
+        } else { /* acceptor name is no_name */
             /* accept acceptor name hint */
             ctx->acceptorName = nameHint;
             nameHint = GSS_C_NO_NAME;

diff --git a/mech_eap/pseudo_random.c b/mech_eap/pseudo_random.c
index 8544a30..ad079b4 100644 (file)
--- a/mech_eap/pseudo_random.c
+++ b/mech_eap/pseudo_random.c
@@ -136,7 +136,7 @@ cleanup:
         GSSEAP_FREE(ns.data);
     }
 #ifdef HAVE_HEIMDAL_VERSION
-    krb5_free_data_contents(krbContext, &t);
+    krb5_data_free(&t);
 #else
     if (t.data != NULL) {
         memset(t.data, 0, t.length);

diff --git a/mech_eap/util_krb.c b/mech_eap/util_krb.c
index 32e28b4..78064f3 100644 (file)
--- a/mech_eap/util_krb.c
+++ b/mech_eap/util_krb.c
@@ -229,7 +229,7 @@ cleanup:
     if (code != 0)
         krb5_free_keyblock_contents(krbContext, &kd);
 #ifdef HAVE_HEIMDAL_VERSION
-    krb5_free_data_contents(krbContext, &t);
+    krb5_data_free(&t);
 #else
     if (t.data != NULL) {
         memset(t.data, 0, t.length);

diff --git a/mech_eap/util_moonshot.c b/mech_eap/util_moonshot.c
index 46282e8..b5027fc 100644 (file)
--- a/mech_eap/util_moonshot.c
+++ b/mech_eap/util_moonshot.c
@@ -157,13 +157,13 @@ libMoonshotResolveInitiatorCred(OM_uint32 *minor,
     MoonshotError *error = NULL;
 
     if (cred->name != GSS_C_NO_NAME) {
-        major = gssEapExportName(minor, cred->name, &initiator);
+      major = gssEapDisplayName(minor, cred->name, &initiator, NULL);
         if (GSS_ERROR(major))
             goto cleanup;
     }
 
     if (targetName != GSS_C_NO_NAME) {
-        major = gssEapExportName(minor, targetName, &target);
+      major = gssEapDisplayName(minor, targetName, &target, NULL);
         if (GSS_ERROR(major))
             goto cleanup;
     }

diff --git a/mech_eap/util_name.c b/mech_eap/util_name.c
index 59e32ad..e60156c 100644 (file)
--- 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;