Windows VC doesn't like empty arrays

This causes compilation error, so the code is ifdefed out on Windows

diff --git a/moonshot/mech_eap/inquire_cred_by_oid.c b/moonshot/mech_eap/inquire_cred_by_oid.c
index 01fc240..169b636 100644 (file)
--- a/moonshot/mech_eap/inquire_cred_by_oid.c
+++ b/moonshot/mech_eap/inquire_cred_by_oid.c
@@ -36,12 +36,14 @@
 
 #include "gssapiP_eap.h"
 
+#ifdef HAVE_INQUIRECREDOPS /* Windows doesn't like zero-sized arrays; define this when we actually have any of these */
 static struct {
     gss_OID_desc oid;
     OM_uint32 (*inquire)(OM_uint32 *, const gss_cred_id_t,
                          const gss_OID, gss_buffer_set_t *);
 } inquireCredOps[] = {
 };
+#endif
 
 OM_uint32 KRB5_CALLCONV
 gss_inquire_cred_by_oid(OM_uint32 *minor,
@@ -64,6 +66,7 @@ gss_inquire_cred_by_oid(OM_uint32 *minor,
     major = GSS_S_UNAVAILABLE;
     *minor = GSSEAP_BAD_CRED_OPTION;
 
+#ifdef HAVE_INQUIRECREDOPS
     for (i = 0; i < sizeof(inquireCredOps) / sizeof(inquireCredOps[0]); i++) {
         if (oidEqual(&inquireCredOps[i].oid, desired_object)) {
             major = (*inquireCredOps[i].inquire)(minor, cred_handle,
@@ -71,6 +74,7 @@ gss_inquire_cred_by_oid(OM_uint32 *minor,
             break;
         }
     }
+#endif
 
     GSSEAP_MUTEX_UNLOCK(&cred_handle->mutex);
 

diff --git a/moonshot/mech_eap/set_sec_context_option.c b/moonshot/mech_eap/set_sec_context_option.c
index 8b4e801..2c7cc7b 100644 (file)
--- a/moonshot/mech_eap/set_sec_context_option.c
+++ b/moonshot/mech_eap/set_sec_context_option.c
@@ -36,12 +36,14 @@
 
 #include "gssapiP_eap.h"
 
+#ifdef HAVE_SETCTXOPS /* Windows doesn't like zero-sized arrays; define this when we actually have any of these */
 static struct {
     gss_OID_desc oid;
     OM_uint32 (*setOption)(OM_uint32 *, gss_ctx_id_t *pCtx,
                            const gss_OID, const gss_buffer_t);
 } setCtxOps[] = {
 };
+#endif
 
 OM_uint32 KRB5_CALLCONV
 gss_set_sec_context_option(OM_uint32 *minor,
@@ -64,6 +66,7 @@ gss_set_sec_context_option(OM_uint32 *minor,
     if (ctx != GSS_C_NO_CONTEXT)
         GSSEAP_MUTEX_LOCK(&ctx->mutex);
 
+#ifdef HAVE_SETCTXOPS
     for (i = 0; i < sizeof(setCtxOps) / sizeof(setCtxOps[0]); i++) {
         if (oidEqual(&setCtxOps[i].oid, desired_object)) {
             major = (*setCtxOps[i].setOption)(minor, &ctx,
@@ -71,6 +74,7 @@ gss_set_sec_context_option(OM_uint32 *minor,
             break;
         }
     }
+#endif
 
     if (pCtx != NULL && *pCtx == NULL)
         *pCtx = ctx;