Resolve minor conflict in merge.

[mech_eap.git] / mech_eap / unwrap.c

diff --git a/mech_eap/unwrap.c b/mech_eap/unwrap.c
index a185035..9bbf62b 100644 (file)
--- a/mech_eap/unwrap.c
+++ b/mech_eap/unwrap.c
@@ -38,7 +38,11 @@
 
 OM_uint32 GSSAPI_CALLCONV
 gss_unwrap(OM_uint32 *minor,
+#ifdef HAVE_HEIMDAL_VERSION
+           gss_const_ctx_id_t ctx,
+#else
            gss_ctx_id_t ctx,
+#endif
            gss_buffer_t input_message_buffer,
            gss_buffer_t output_message_buffer,
            int *conf_state,
@@ -54,7 +58,7 @@ gss_unwrap(OM_uint32 *minor,
 
     *minor = 0;
 
-    GSSEAP_MUTEX_LOCK(&ctx->mutex);
+    GSSEAP_MUTEX_LOCK(&((gss_ctx_id_t)ctx)->mutex);
 
     if (!CTX_IS_ESTABLISHED(ctx)) {
         major = GSS_S_NO_CONTEXT;
@@ -69,7 +73,8 @@ gss_unwrap(OM_uint32 *minor,
     iov[1].buffer.value = NULL;
     iov[1].buffer.length = 0;
 
-    major = gssEapUnwrapOrVerifyMIC(minor, ctx, conf_state, qop_state,
+    major = gssEapUnwrapOrVerifyMIC(minor, (gss_ctx_id_t)ctx,
+                                    conf_state, qop_state,
                                     iov, 2, TOK_TYPE_WRAP);
     if (major == GSS_S_COMPLETE) {
         *output_message_buffer = iov[1].buffer;
@@ -79,7 +84,7 @@ gss_unwrap(OM_uint32 *minor,
     }
 
 cleanup:
-    GSSEAP_MUTEX_UNLOCK(&ctx->mutex);
+    GSSEAP_MUTEX_UNLOCK(&((gss_ctx_id_t)ctx)->mutex);
 
     return major;
 }