X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=gssapiP_eap.h;h=b53e131c929bc684df081588f59c26b2db7836ea;hb=163856b1a70d7773c46d4ea5495b85c4dce0f089;hp=aa0a9c4b07389ae0038a15a30620a918cd6da381;hpb=4df013b188b325ef586060cb905fef353a532422;p=mech_eap.git

diff --git a/gssapiP_eap.h b/gssapiP_eap.h
index aa0a9c4..b53e131 100644
--- a/gssapiP_eap.h
+++ b/gssapiP_eap.h
@@ -46,7 +46,9 @@
 /* GSS headers */
 #include <gssapi/gssapi.h>
 #include <gssapi/gssapi_krb5.h>
+#ifndef HAVE_HEIMDAL_VERSION
 #include <gssapi/gssapi_ext.h>
+#endif
 #include "gssapi_eap.h"
 
 /* Kerberos headers */
@@ -89,7 +91,12 @@ extern "C" {
 struct gss_eap_saml_attr_ctx;
 struct gss_eap_attr_ctx;
 
-struct gss_name_struct {
+#ifdef HAVE_HEIMDAL_VERSION
+struct gss_name_t_desc_struct
+#else
+struct gss_name_struct
+#endif
+{
     GSSEAP_MUTEX mutex; /* mutex protects attrCtx */
     OM_uint32 flags;
     krb5_principal krbPrincipal; /* this is immutable */
@@ -103,7 +110,12 @@ struct gss_name_struct {
 #define CRED_FLAG_DEFAULT_CCACHE            0x00100000
 #define CRED_FLAG_PUBLIC_MASK               0x0000FFFF
 
-struct gss_cred_id_struct {
+#ifdef HAVE_HEIMDAL_VERSION
+struct gss_cred_id_t_desc_struct
+#else
+struct gss_cred_id_struct
+#endif
+{
     GSSEAP_MUTEX mutex;
     OM_uint32 flags;
     gss_name_t name;
@@ -124,14 +136,14 @@ struct gss_cred_id_struct {
 #define CTX_IS_INITIATOR(ctx)               (((ctx)->flags & CTX_FLAG_INITIATOR) != 0)
 
 enum gss_eap_state {
-    GSSEAP_STATE_IDENTITY = 0,
-    GSSEAP_STATE_AUTHENTICATE,
-    GSSEAP_STATE_EXTENSIONS_REQ,
-    GSSEAP_STATE_EXTENSIONS_RESP,
-    GSSEAP_STATE_ESTABLISHED,
-    GSSEAP_STATE_ERROR,
+    GSSEAP_STATE_IDENTITY = 0,              /* identify peer */
+    GSSEAP_STATE_AUTHENTICATE,              /* exchange EAP messages */
+    GSSEAP_STATE_EXTENSIONS_REQ,            /* initiator extensions */
+    GSSEAP_STATE_EXTENSIONS_RESP,           /* acceptor extensions */
+    GSSEAP_STATE_ESTABLISHED,               /* context established */
+    GSSEAP_STATE_ERROR,                     /* context error */
 #ifdef GSSEAP_ENABLE_REAUTH
-    GSSEAP_STATE_KRB_REAUTH
+    GSSEAP_STATE_KRB_REAUTH                 /* fast reauthentication */
 #endif
 };
 
@@ -167,7 +179,12 @@ struct gss_eap_acceptor_ctx {
     VALUE_PAIR *vps;
 };
 
-struct gss_ctx_id_struct {
+#ifdef HAVE_HEIMDAL_VERSION
+struct gss_ctx_id_t_desc_struct
+#else
+struct gss_ctx_id_struct
+#endif
+{
     GSSEAP_MUTEX mutex;
     enum gss_eap_state state;
     OM_uint32 flags;
@@ -245,6 +262,9 @@ rfc4121Flags(gss_ctx_id_t ctx, int receiving);
 void
 gssEapSaveStatusInfo(OM_uint32 minor, const char *format, ...);
 
+#define IS_WIRE_ERROR(err)              ((err) > GSSEAP_RESERVED && \
+                                         (err) <= GSSEAP_RADIUS_PROT_FAILURE)
+
 #ifdef __cplusplus
 }
 #endif