From: Luke Howard <lukeh@padl.com>
Date: Sun, 3 Apr 2011 08:43:43 +0000 (+1000)
Subject: Revert "try to guard against multiple shibboleth library initializations"
X-Git-Url: http://www.project-moonshot.org/gitweb/?p=moonshot.git;a=commitdiff_plain;h=0f5d8bdd271ac97fc7d8316fc250d74322c0ca31;hp=d711bd312deb99a5cb6b9f8b519d3add75292e46

Revert "try to guard against multiple shibboleth library initializations"

This reverts commit d711bd312deb99a5cb6b9f8b519d3add75292e46.
---

diff --git a/mech_eap/util_shib.cpp b/mech_eap/util_shib.cpp
index b1464f7..778ad25 100644
--- a/mech_eap/util_shib.cpp
+++ b/mech_eap/util_shib.cpp
@@ -450,8 +450,7 @@ gss_eap_shib_attr_provider::initWithJsonObject(const gss_eap_attr_ctx *ctx,
 bool
 gss_eap_shib_attr_provider::init(void)
 {
-    if (SPConfig::getConfig().getFeatures() == 0 &&
-        ShibbolethResolver::init() == false)
+    if (!ShibbolethResolver::init())
         return false;
 
     gss_eap_attr_ctx::registerProvider(ATTR_TYPE_LOCAL, createAttrContext);