Fixes for Heimdal (macOS) builds from Stefan.

[mech_eap.git] / mech_eap / util_attr.h

diff --git a/mech_eap/util_attr.h b/mech_eap/util_attr.h
index e3f3567..32a3f78 100644 (file)
--- a/mech_eap/util_attr.h
+++ b/mech_eap/util_attr.h
@@ -41,6 +41,10 @@
 #include <string>
 #include <new>
 
+#ifndef HAVE_HEIMDAL_VERSION
+#include "gssapi_headerfix.h"
+#endif
+
 using namespace gss_eap_util;
 
 struct gss_eap_attr_provider;
@@ -53,8 +57,10 @@ typedef bool
                                void *data);
 
 #define ATTR_TYPE_RADIUS            0U                  /* RADIUS AVPs */
+#ifdef HAVE_OPENSAML
 #define ATTR_TYPE_SAML_ASSERTION    1U                  /* SAML assertion */
 #define ATTR_TYPE_SAML              2U                  /* SAML attributes */
+#endif
 #define ATTR_TYPE_LOCAL             3U                  /* Local attributes */
 #define ATTR_TYPE_MIN               ATTR_TYPE_RADIUS
 #define ATTR_TYPE_MAX               ATTR_TYPE_LOCAL
@@ -347,7 +353,7 @@ gssEapSetNameAttribute(OM_uint32 *minor,
 
 OM_uint32
 gssEapExportAttrContext(OM_uint32 *minor,
-                        gss_name_t name,
+                        gss_const_name_t name,
                         gss_buffer_t buffer);
 
 OM_uint32
@@ -357,7 +363,7 @@ gssEapImportAttrContext(OM_uint32 *minor,
 
 OM_uint32
 gssEapDuplicateAttrContext(OM_uint32 *minor,
-                           gss_name_t in,
+                           gss_const_name_t in,
                            gss_name_t out);
 
 OM_uint32
@@ -377,9 +383,6 @@ OM_uint32
 gssEapReleaseAttrContext(OM_uint32 *minor,
                          gss_name_t name);
 
-OM_uint32
-gssEapAttrProvidersFinalize(OM_uint32 *minor);
-
 #ifdef __cplusplus
 }
 #endif