remove debugging statement

[moonshot.git] / mech_eap / get_name_attribute.c

diff --git a/mech_eap/get_name_attribute.c b/mech_eap/get_name_attribute.c
index 3b22dc5..8273368 100644 (file)
--- a/mech_eap/get_name_attribute.c
+++ b/mech_eap/get_name_attribute.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, JANET(UK)
+ * Copyright (c) 2011, JANET(UK)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -32,6 +32,10 @@
 
 #include "gssapiP_eap.h"
 
+/*
+ * Wrapper for retrieving a naming attribute.
+ */
+
 OM_uint32
 gss_get_name_attribute(OM_uint32 *minor,
                        gss_name_t name,
@@ -42,52 +46,21 @@ gss_get_name_attribute(OM_uint32 *minor,
                        gss_buffer_t display_value,
                        int *more)
 {
-    OM_uint32 major, tmpMinor;
-    gss_buffer_desc prefix, suffix;
-    enum gss_eap_attribute_type type;
+    OM_uint32 major;
+
+    *minor = 0;
 
     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);
-    switch (type) {
-    case ATTR_TYPE_NONE:
-    case ATTR_TYPE_SAML_ATTR:
-        major = samlGetAttribute(minor, type, name,
-                                 (type == ATTR_TYPE_NONE) ? attr : &suffix,
-                                 authenticated, complete,
-                                 value, display_value, more);
-        break;
-    case ATTR_TYPE_SAML_AAA_ASSERTION:
-        major = samlGetAssertion(minor, name, value);
-        break;
-    case ATTR_TYPE_RADIUS_AVP:
-        major = radiusGetAttribute(minor, name, &suffix,
+    major = gssEapGetNameAttribute(minor, name, attr,
                                    authenticated, complete,
                                    value, display_value, more);
-        break;
-    default:
-        major = GSS_S_UNAVAILABLE;
-        break;
-    }
 
-cleanup:
     GSSEAP_MUTEX_UNLOCK(&name->mutex);
 
     return major;