Allow providers to be NULL, to deal build options

[mech_eap.orig] / util.h

diff --git a/util.h b/util.h
index c95dc37..5e63616 100644 (file)
--- a/util.h
+++ b/util.h
@@ -66,8 +66,6 @@
 extern "C" {
 #endif
 
-#include "util_saml.h"
-
 #ifndef MIN             /* Usually found in <sys/param.h>. */
 #define MIN(_a,_b)  ((_a)<(_b)?(_a):(_b))
 #endif
@@ -283,38 +281,26 @@ gssEapValidateMechs(OM_uint32 *minor,
                    const gss_OID_set mechs);
 
 /* util_name.c */
-enum gss_eap_attribute_type {
-    ATTR_TYPE_NONE                  = 0,
-    ATTR_TYPE_SAML_AAA_ASSERTION    = 1,
-    ATTR_TYPE_SAML_ATTR             = 2,
-    ATTR_TYPE_RADIUS_AVP            = 3
-};
+#define EXPORT_NAME_FLAG_OID        0x1
+#define EXPORT_NAME_FLAG_COMPOSITE  0x2
 
 OM_uint32 gssEapAllocName(OM_uint32 *minor, gss_name_t *pName);
 OM_uint32 gssEapReleaseName(OM_uint32 *minor, gss_name_t *pName);
 OM_uint32 gssEapExportName(OM_uint32 *minor,
                            const gss_name_t name,
-                           gss_buffer_t exportedName,
-                           int composite);
+                           gss_buffer_t exportedName);
+OM_uint32 gssEapExportNameInternal(OM_uint32 *minor,
+                                   const gss_name_t name,
+                                   gss_buffer_t exportedName,
+                                   unsigned int flags);
 OM_uint32 gssEapImportName(OM_uint32 *minor,
                            const gss_buffer_t input_name_buffer,
                            gss_OID input_name_type,
                            gss_name_t *output_name);
-
-enum gss_eap_attribute_type
-gssEapAttributePrefixToType(const gss_buffer_t prefix);
-gss_buffer_t
-gssEapAttributeTypeToPrefix(enum gss_eap_attribute_type type);
-OM_uint32
-decomposeAttributeName(OM_uint32 *minor,
-                       const gss_buffer_t attribute,
-                       gss_buffer_t prefix,
-                       gss_buffer_t suffix);
-OM_uint32
-composeAttributeName(OM_uint32 *minor,
-                     const gss_buffer_t prefix,
-                     const gss_buffer_t suffix,
-                     gss_buffer_t attribute);
+OM_uint32 gssEapImportNameInternal(OM_uint32 *minor,
+                                   const gss_buffer_t input_name_buffer,
+                                   gss_name_t *output_name,
+                                   unsigned int flags);
 
 /* util_oid.c */
 OM_uint32
@@ -543,4 +529,6 @@ store_oid(gss_OID oid, void *vp)
 }
 #endif
 
+#include "util_attr.h"
+
 #endif /* _UTIL_H_ */