Fixes for Heimdal (macOS) builds from Stefan.

[mech_eap.git] / mech_eap / inquire_cred_by_oid.c

diff --git a/mech_eap/inquire_cred_by_oid.c b/mech_eap/inquire_cred_by_oid.c
index b8ff40e..77c27fb 100644 (file)
--- a/mech_eap/inquire_cred_by_oid.c
+++ b/mech_eap/inquire_cred_by_oid.c
@@ -36,7 +36,7 @@
 
 #include "gssapiP_eap.h"
 
-#ifdef HAVE_INQUIRECREDOPS /* Windows doesn't like zero-sized arrays; define this when we actually have any of these */
+#if 0
 static struct {
     gss_OID_desc oid;
     OM_uint32 (*inquire)(OM_uint32 *, const gss_cred_id_t,
@@ -45,15 +45,20 @@ static struct {
 };
 #endif
 
-OM_uint32 KRB5_CALLCONV
+OM_uint32 GSSAPI_CALLCONV
 gss_inquire_cred_by_oid(OM_uint32 *minor,
+#ifdef HAVE_HEIMDAL_VERSION
+                        gss_const_cred_id_t cred_handle,
+#else
                         const gss_cred_id_t cred_handle,
-                        const gss_OID desired_object,
+#endif
+                        const gss_OID desired_object GSSEAP_UNUSED,
                         gss_buffer_set_t *data_set)
 {
     OM_uint32 major;
+#if 0
     int i;
-
+#endif
     *data_set = GSS_C_NO_BUFFER_SET;
 
     if (cred_handle == GSS_C_NO_CREDENTIAL) {
@@ -61,12 +66,12 @@ gss_inquire_cred_by_oid(OM_uint32 *minor,
         return GSS_S_CALL_INACCESSIBLE_READ | GSS_S_NO_CRED;
     }
 
-    GSSEAP_MUTEX_LOCK(&cred_handle->mutex);
+    GSSEAP_MUTEX_LOCK(&((gss_cred_id_t)cred_handle)->mutex);
 
     major = GSS_S_UNAVAILABLE;
     *minor = GSSEAP_BAD_CRED_OPTION;
 
-#ifdef HAVE_INQUIRECREDOPS
+#if 0
     for (i = 0; i < sizeof(inquireCredOps) / sizeof(inquireCredOps[0]); i++) {
         if (oidEqual(&inquireCredOps[i].oid, desired_object)) {
             major = (*inquireCredOps[i].inquire)(minor, cred_handle,
@@ -74,12 +79,9 @@ gss_inquire_cred_by_oid(OM_uint32 *minor,
             break;
         }
     }
-#else
-    (void)i;
-    (void)desired_object;
 #endif
 
-    GSSEAP_MUTEX_UNLOCK(&cred_handle->mutex);
+    GSSEAP_MUTEX_UNLOCK(&((gss_cred_id_t)cred_handle)->mutex);
 
     return major;
 }