From: Luke Howard <lukeh@padl.com>
Date: Sun, 3 Apr 2011 08:49:59 +0000 (+1000)
Subject: Revert "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=156cea08f449a20a965e5e004460bbd32361f106

Revert "Revert "try to guard against multiple shibboleth library initializations""

This reverts commit 0f5d8bdd271ac97fc7d8316fc250d74322c0ca31.
---

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