More work on SAML code

[cyrus-sasl.git] / mech_eap / set_name_attribute.c

diff --git a/mech_eap/set_name_attribute.c b/mech_eap/set_name_attribute.c
index 385ead4..9807557 100644 (file)
--- a/mech_eap/set_name_attribute.c
+++ b/mech_eap/set_name_attribute.c
@@ -39,7 +39,7 @@ gss_set_name_attribute(OM_uint32 *minor,
                        gss_buffer_t attr,
                        gss_buffer_t value)
 {
-    OM_uint32 major, tmpMinor;
+    OM_uint32 major;
     gss_buffer_desc prefix, suffix;
     enum gss_eap_attribute_type type;
 
@@ -55,19 +55,10 @@ gss_set_name_attribute(OM_uint32 *minor,
         goto cleanup;
 
     type = gssEapAttributePrefixToType(&prefix);
-    switch (type) {
-    case ATTR_TYPE_SAML_ATTR:
-        major = samlSetAttribute(minor, name->assertion,
-                                 complete, &suffix, value);
-        break;
-    case ATTR_TYPE_RADIUS_AVP:
-        major = radiusSetAVP(minor, name->avps,
-                             complete, &suffix, value);
-        break;
-    default:
-        *minor = ENOENT;
+    if (type == ATTR_TYPE_NONE) {
+        major = samlSetAttribute(minor, name, complete, attr, value);
+    } else {
         major = GSS_S_UNAVAILABLE;
-        break;
     }
 
 cleanup: