Merge branch 'master' of ssh://moonshot.suchdamage.org:822/srv/git/moonshot

[mech_eap.orig] / set_name_attribute.c

diff --git a/set_name_attribute.c b/set_name_attribute.c
index 9807557..e2f635b 100644 (file)
--- a/set_name_attribute.c
+++ b/set_name_attribute.c
@@ -30,6 +30,10 @@
  * SUCH DAMAGE.
  */
 
+/*
+ * Set an attribute on a name.
+ */
+
 #include "gssapiP_eap.h"
 
 OM_uint32
@@ -40,8 +44,6 @@ gss_set_name_attribute(OM_uint32 *minor,
                        gss_buffer_t value)
 {
     OM_uint32 major;
-    gss_buffer_desc prefix, suffix;
-    enum gss_eap_attribute_type type;
 
     if (name == GSS_C_NO_NAME) {
         *minor = EINVAL;
@@ -50,18 +52,8 @@ gss_set_name_attribute(OM_uint32 *minor,
 
     GSSEAP_MUTEX_LOCK(&name->mutex);
 
-    major = decomposeAttributeName(minor, attr, &prefix, &suffix);
-    if (GSS_ERROR(major))
-        goto cleanup;
-
-    type = gssEapAttributePrefixToType(&prefix);
-    if (type == ATTR_TYPE_NONE) {
-        major = samlSetAttribute(minor, name, complete, attr, value);
-    } else {
-        major = GSS_S_UNAVAILABLE;
-    }
+    major = gssEapSetNameAttribute(minor, name, complete, attr, value);
 
-cleanup:
     GSSEAP_MUTEX_UNLOCK(&name->mutex);
 
     return major;