From: Luke Howard <lukeh@padl.com>
Date: Mon, 20 Sep 2010 14:55:15 +0000 (+0200)
Subject: cleanup
X-Git-Url: http://www.project-moonshot.org/gitweb/?p=cyrus-sasl.git;a=commitdiff_plain;h=98665f023d036bb9250576e213e4d1927b512135

cleanup
---

diff --git a/mech_eap/util_shib.cpp b/mech_eap/util_shib.cpp
index 3d028b8..8da0bbc 100644
--- a/mech_eap/util_shib.cpp
+++ b/mech_eap/util_shib.cpp
@@ -435,25 +435,8 @@ gss_eap_shib_attr_provider::initFromBuffer(const gss_eap_attr_ctx *ctx,
 bool
 gss_eap_shib_attr_provider::init(void)
 {
-#if 1
-    SPConfig& conf=SPConfig::getConfig();
-    conf.setFeatures(
-        SPConfig::Metadata |
-        SPConfig::Trust |
-        SPConfig::AttributeResolution |
-        SPConfig::Credentials |
-        SPConfig::OutOfProcess
-        );
-    if (!conf.init())
-        return false;
-    if (!conf.instantiate()) {
-        conf.term();
-        return false;
-    }
-#else
     if (!ShibbolethResolver::init())
         return false;
-#endif
 
     gss_eap_attr_ctx::registerProvider(ATTR_TYPE_LOCAL,
                                        NULL,
@@ -466,7 +449,7 @@ void
 gss_eap_shib_attr_provider::finalize(void)
 {
     gss_eap_attr_ctx::unregisterProvider(ATTR_TYPE_LOCAL);
-//    ShibbolethResolver::term();
+    ShibbolethResolver::term();
 }
 
 gss_eap_attr_provider *