projects
/
moonshot.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
0f5d8bd
)
Revert "Revert "try to guard against multiple shibboleth library initializations""
author
Luke Howard
<lukeh@padl.com>
Sun, 3 Apr 2011 08:49:59 +0000
(18:49 +1000)
committer
Luke Howard
<lukeh@padl.com>
Sun, 3 Apr 2011 08:49:59 +0000
(18:49 +1000)
This reverts commit
0f5d8bdd271ac97fc7d8316fc250d74322c0ca31
.
mech_eap/util_shib.cpp
patch
|
blob
|
history
diff --git
a/mech_eap/util_shib.cpp
b/mech_eap/util_shib.cpp
index
778ad25
..
b1464f7
100644
(file)
--- 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);