Add #include <includes.h> to gssapiP_eap.h.

[moonshot.git] / moonshot / mech_eap / gssapiP_eap.h

diff --git a/moonshot/mech_eap/gssapiP_eap.h b/moonshot/mech_eap/gssapiP_eap.h
index d1d6bce..a2ce5d6 100644 (file)
--- a/moonshot/mech_eap/gssapiP_eap.h
+++ b/moonshot/mech_eap/gssapiP_eap.h
@@ -42,11 +42,15 @@
 #include <assert.h>
 #include <string.h>
 #include <errno.h>
+#if defined(HAVE_UNISTD_H)
 #include <unistd.h>
+#endif
 #include <stdlib.h>
 #include <stdarg.h>
 #include <time.h>
+#if defined(HAVE_SYS_PARAM_H)
 #include <sys/param.h>
+#endif
 
 /* GSS headers */
 #include <gssapi/gssapi.h>
@@ -58,10 +62,15 @@ typedef struct gss_any *gss_any_t;
 #endif
 #include "gssapi_eap.h"
 
+#ifndef HAVE_GSS_INQUIRE_ATTRS_FOR_MECH
+typedef const gss_OID_desc *gss_const_OID;
+#endif
+
 /* Kerberos headers */
 #include <krb5.h>
 
 /* EAP headers */
+#include <includes.h>
 #include <common.h>
 #include <eap_peer/eap.h>
 #include <eap_peer/eap_config.h>
@@ -69,6 +78,7 @@ typedef struct gss_any *gss_any_t;
 #include <eap_common/eap_common.h>
 #include <wpabuf.h>
 
+#ifdef GSSEAP_ENABLE_ACCEPTOR
 /* FreeRADIUS headers */
 #ifdef __cplusplus
 extern "C" {
@@ -76,12 +86,20 @@ extern "C" {
 #endif
 #include <freeradius/libradius.h>
 #include <freeradius/radius.h>
+
+////Because freeradius/autoconf.h is evil!
+////#undef uint16_t
+////#undef uint32_t
+////#undef uint8_t
+#undef pid_t
+
 #include <radsec/radsec.h>
 #include <radsec/request.h>
 #ifdef __cplusplus
 #undef operator
 }
 #endif
+#endif /*GSSEAP_ENABLE_ACCEPTOR*/
 
 #include "gsseap_err.h"
 #include "radsec_err.h"
@@ -165,6 +183,7 @@ struct gss_eap_initiator_ctx {
     struct wpabuf reqData;
 };
 
+#ifdef GSSEAP_ENABLE_ACCEPTOR
 struct gss_eap_acceptor_ctx {
     struct rs_context *radContext;
     struct rs_connection *radConn;
@@ -172,6 +191,7 @@ struct gss_eap_acceptor_ctx {
     gss_buffer_desc state;
     VALUE_PAIR *vps;
 };
+#endif
 
 #ifdef HAVE_HEIMDAL_VERSION
 struct gss_ctx_id_t_desc_struct
@@ -196,8 +216,10 @@ struct gss_ctx_id_struct
     union {
         struct gss_eap_initiator_ctx initiator;
         #define initiatorCtx         ctxU.initiator
+#ifdef GSSEAP_ENABLE_ACCEPTOR
         struct gss_eap_acceptor_ctx  acceptor;
         #define acceptorCtx          ctxU.acceptor
+#endif
 #ifdef GSSEAP_ENABLE_REAUTH
         gss_ctx_id_t                 reauth;
         #define reauthCtx            ctxU.reauth