cleanup

diff --git a/mech_eap/util_attr.cpp b/mech_eap/util_attr.cpp
index 92f8cc9..098dcb6 100644 (file)
--- a/mech_eap/util_attr.cpp
+++ b/mech_eap/util_attr.cpp
@@ -331,10 +331,16 @@ gss_eap_attr_ctx::releaseAnyNameMapping(gss_buffer_t type_id,
     provider->releaseAnyNameMapping(type_id, input);
 }
 
+gss_eap_attr_provider *
+gss_eap_attr_ctx::getPrimaryProvider(void) const
+{
+    return m_providers[ATTR_TYPE_RADIUS];
+}
+
 void
 gss_eap_attr_ctx::exportToBuffer(gss_buffer_t buffer) const
 {
-    m_providers[ATTR_TYPE_RADIUS]->exportToBuffer(buffer);
+    getPrimaryProvider()->exportToBuffer(buffer);
 }
 
 bool
@@ -342,18 +348,24 @@ gss_eap_attr_ctx::initFromBuffer(const gss_buffer_t buffer)
 {
     unsigned int i;
     bool ret;
+    gss_eap_attr_provider *primaryProvider = getPrimaryProvider();
 
-    ret = m_providers[ATTR_TYPE_RADIUS]->initFromBuffer(this, buffer);
-    if (!ret)
+    assert(primaryProvider != NULL);
+
+    ret = primaryProvider->initFromBuffer(this, buffer);
+    if (ret == false)
         return false;
 
-    for (i = ATTR_TYPE_RADIUS + 1; i < ATTR_TYPE_MAX; i++) {
+    for (i = ATTR_TYPE_MIN; i < ATTR_TYPE_MAX; i++) {
         gss_eap_attr_provider *provider = m_providers[i];
 
+        if (provider == primaryProvider)
+            continue;
+
         ret = provider->initFromGssContext(this,
                                            GSS_C_NO_CREDENTIAL,
                                            GSS_C_NO_CONTEXT);
-        if (!ret)
+        if (ret == false)
             break;
     }
 

diff --git a/mech_eap/util_attr.h b/mech_eap/util_attr.h
index 90d56c8..206e424 100644 (file)
--- a/mech_eap/util_attr.h
+++ b/mech_eap/util_attr.h
@@ -192,6 +192,8 @@ public:
     unregisterProvider(unsigned int type);
 
 private:
+    gss_eap_attr_provider *getPrimaryProvider(void) const;
+
     /* make non-copyable */
     gss_eap_attr_ctx(const gss_eap_attr_ctx&);
     gss_eap_attr_ctx& operator=(const gss_eap_attr_ctx&);