X-Git-Url: http://www.project-moonshot.org/gitweb/?p=mech_eap.orig;a=blobdiff_plain;f=gssapiP_eap.h;h=1d97e738a45d5cf2111bf4cb5102fc9b51eab9b4;hp=35cc154bad19d28d32c832a012521e90886585cd;hb=81378d116795fa8a7a56dc8e00c3b2666126682d;hpb=899e578a598e3be50fdf3e7cc1ef033e60d4067a

diff --git a/gssapiP_eap.h b/gssapiP_eap.h
index 35cc154..1d97e73 100644
--- a/gssapiP_eap.h
+++ b/gssapiP_eap.h
@@ -65,18 +65,16 @@
 #define NAME_FLAG_RADIUS_ATTRIBUTES         0x00000004
 #define NAME_FLAG_SAML_ATTRIBUTES           0x00000008
 
-#define NAME_HAS_ATTRIBUTES(name)           \
-                (((name)->flags & (NAME_FLAG_RADIUS_ATTRIBUTES | \
-                                   NAME_FLAG_SAML_ATTRIBUTES)) != 0)
+#define NAME_HAS_ATTRIBUTES(name)           ((name)->attrCtx != NULL)
 
 struct gss_eap_saml_attr_ctx;
+struct gss_eap_attr_ctx;
 
 struct gss_name_struct {
     GSSEAP_MUTEX mutex; /* mutex protecting attributes */
     OM_uint32 flags;
     krb5_principal krbPrincipal; /* this is immutable */
-    struct gss_eap_radius_attr_ctx *radiusCtx;
-    struct gss_eap_saml_attr_ctx *samlCtx;
+    struct gss_eap_attr_ctx *attrCtx;
 };
 
 #define CRED_FLAG_INITIATE                  0x00000001
@@ -119,6 +117,7 @@ enum gss_eap_state {
 #define CTX_FLAG_EAP_PORT_ENABLED           0x00400000
 #define CTX_FLAG_EAP_ALT_ACCEPT             0x00800000
 #define CTX_FLAG_EAP_ALT_REJECT             0x01000000
+#define CTX_FLAG_EAP_MASK                   0xFFFF0000
 
 struct gss_eap_initiator_ctx {
     unsigned int idleWhile;