SAML cleanups

[mech_eap.orig] / get_name_attribute.c

diff --git a/get_name_attribute.c b/get_name_attribute.c
index f2ea472..525137f 100644 (file)
--- a/get_name_attribute.c
+++ b/get_name_attribute.c
@@ -43,14 +43,37 @@ gss_get_name_attribute(OM_uint32 *minor,
                        int *more)
 {
     OM_uint32 major, tmpMinor;
+    gss_buffer_desc prefix, suffix;
+    enum gss_eap_attribute_type type;
 
     if (name == GSS_C_NO_NAME) {
         *minor = EINVAL;
         return GSS_S_CALL_INACCESSIBLE_READ | GSS_S_BAD_NAME;
     }
 
+    *authenticated = 0;
+    *complete = 0;
+    value->length = 0;
+    value->value = NULL;
+    display_value->length = 0;
+    display_value->value = NULL;
+    *more = -1;
+
     GSSEAP_MUTEX_LOCK(&name->mutex);
 
+    major = decomposeAttributeName(minor, attr, &prefix, &suffix);
+    if (GSS_ERROR(major))
+        goto cleanup;
+
+    type = gssEapAttributePrefixToType(&prefix);
+    if (type == ATTR_TYPE_SAML_AAA_ASSERTION) {
+        major = samlGetAssertion(minor, name->samlCtx, value);
+    } else {
+        major = samlGetAttribute(minor, name->samlCtx, &suffix,
+                                 authenticated, complete,
+                                 value, display_value, more);
+    }
+
 cleanup:
     GSSEAP_MUTEX_UNLOCK(&name->mutex);