Resolve minor conflict in merge.

[mech_eap.git] / mech_eap / canonicalize_name.c

diff --git a/mech_eap/canonicalize_name.c b/mech_eap/canonicalize_name.c
index 5e66798..06ed323 100644 (file)
--- a/mech_eap/canonicalize_name.c
+++ b/mech_eap/canonicalize_name.c
@@ -38,7 +38,11 @@
 
 OM_uint32 GSSAPI_CALLCONV
 gss_canonicalize_name(OM_uint32 *minor,
+#ifdef HAVE_HEIMDAL_VERSION
+                      gss_const_name_t input_name,
+#else
                       const gss_name_t input_name,
+#endif
                       const gss_OID mech_type,
                       gss_name_t *output_name)
 {
@@ -54,11 +58,11 @@ gss_canonicalize_name(OM_uint32 *minor,
         return GSS_S_CALL_INACCESSIBLE_READ | GSS_S_BAD_NAME;
     }
 
-    GSSEAP_MUTEX_LOCK(&input_name->mutex);
+    GSSEAP_MUTEX_LOCK(&((gss_name_t)input_name)->mutex);
 
     major = gssEapCanonicalizeName(minor, input_name, mech_type, output_name);
 
-    GSSEAP_MUTEX_UNLOCK(&input_name->mutex);
+    GSSEAP_MUTEX_UNLOCK(&((gss_name_t)input_name)->mutex);
 
     return major;
 }