cleanup attribute names for radius

[mech_eap.orig] / util_radius.h

diff --git a/util_radius.h b/util_radius.h
index 4c10291..cc84900 100644 (file)
--- a/util_radius.h
+++ b/util_radius.h
@@ -80,6 +80,12 @@ public:
                       gss_buffer_t display_value,
                       int *more) const;
 
+    bool getFragmentedAttribute(int attribute,
+                                int vendor,
+                                int *authenticated,
+                                int *complete,
+                                gss_buffer_t value) const;
+
     bool authenticated() const { return m_authenticated; }
 
     static bool init();
@@ -100,8 +106,6 @@ private:
 };
 
 /* For now */
-#define PW_SAML_ASSERTION           1936
-
 extern "C" {
 #endif
 
@@ -132,18 +136,19 @@ gssEapRadiusAllocHandle(OM_uint32 *minor,
 #define RC_CONFIG_FILE      SYSCONFDIR "/radiusclient/radiusclient.conf"
 
 /* RFC 2548 - Microsoft Vendor-specific RADIUS Attributes */
-#define RADIUS_VENDOR_ID_MICROSOFT 311
+#define VENDOR_ID_MICROSOFT 311
 
-enum { RADIUS_VENDOR_ATTR_MS_MPPE_SEND_KEY = 16,
-       RADIUS_VENDOR_ATTR_MS_MPPE_RECV_KEY = 17
+enum { VENDOR_ATTR_MS_MPPE_SEND_KEY = 16,
+       VENDOR_ATTR_MS_MPPE_RECV_KEY = 17
 };
 
-/* OK, this is completely unassigned */
-#define RADIUS_VENDOR_ID_GSS_EAP   5322
+#define VENDOR_ID_GSS_EAP   5322    /* XXX TODO assign */
 
-enum { RADIUS_VENDOR_ATTR_GSS_EAP_ACCEPTOR_SERVICE_NAME = 1,
-       RADIUS_VENDOR_ATTR_GSS_EAP_ACCEPTOR_HOST_NAME,
-       RADIUS_VENDOR_ATTR_GSS_EAP_ACCEPTOR_REALM_NAME };
+enum { VENDOR_ATTR_GSS_ACCEPTOR_SERVICE_NAME = 1,
+       VENDOR_ATTR_GSS_ACCEPTOR_HOST_NAME,
+       VENDOR_ATTR_GSS_ACCEPTOR_REALM_NAME,
+       VENDOR_ATTR_SAML_AAA_ASSERTION
+};
 
 #ifdef __cplusplus
 }