X-Git-Url: http://www.project-moonshot.org/gitweb/?p=mech_eap.git;a=blobdiff_plain;f=gssapiP_eap.h;h=eef420601963975e10d11c5c387b81e7105cb500;hp=bb61a012f92c8d651a0651bf28191f4472ae0d77;hb=cff9dae64ddb2ead188889c9164961bd364e8cd2;hpb=e8fadbee7396a73ec138425e54db68e4603ed66c

diff --git a/gssapiP_eap.h b/gssapiP_eap.h
index bb61a01..eef4206 100644
--- a/gssapiP_eap.h
+++ b/gssapiP_eap.h
@@ -33,8 +33,6 @@
 #ifndef _GSSAPIP_EAP_H_
 #define _GSSAPIP_EAP_H_ 1
 
-#define BUILTIN_EAP 1
-
 #include <assert.h>
 #include <string.h>
 #include <errno.h>
@@ -60,6 +58,17 @@
 #include <wpabuf.h>
 #endif
 
+#ifdef __cplusplus
+struct rc_conf;
+typedef struct rc_conf rc_handle;
+
+struct value_pair;
+typedef struct value_pair VALUE_PAIR;
+#else
+#include <freeradius-client.h>
+#include <freeradius/radius.h>
+#endif
+
 /* These name flags are informative and not actually used by anything yet */
 #define NAME_FLAG_NAI                       0x00000001
 #define NAME_FLAG_SERVICE                   0x00000002
@@ -127,11 +136,8 @@ struct gss_eap_initiator_ctx {
 };
 
 struct gss_eap_acceptor_ctx {
-#if defined(BUILTIN_EAP) && !defined(__cplusplus)
-    struct eap_eapol_interface *eapPolInterface;
-    void *tlsContext;
-    struct eap_sm *eap;
-#endif
+    rc_handle *radHandle;
+    VALUE_PAIR *avps;
 };
 
 struct gss_ctx_id_struct {