projects
/
moonshot.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
b5b9f68
)
catch exceptions initialising Shibboleth
author
Luke Howard
<lukeh@padl.com>
Mon, 16 May 2011 08:05:20 +0000
(10:05 +0200)
committer
Luke Howard
<lukeh@padl.com>
Mon, 16 May 2011 08:05:20 +0000
(10:05 +0200)
moonshot/mech_eap/util_shib.cpp
patch
|
blob
|
history
diff --git
a/moonshot/mech_eap/util_shib.cpp
b/moonshot/mech_eap/util_shib.cpp
index
b01bf7b
..
15a8b44
100644
(file)
--- a/
moonshot/mech_eap/util_shib.cpp
+++ b/
moonshot/mech_eap/util_shib.cpp
@@
-434,13
+434,18
@@
gss_eap_shib_attr_provider::initWithJsonObject(const gss_eap_attr_ctx *ctx,
bool
gss_eap_shib_attr_provider::init(void)
{
bool
gss_eap_shib_attr_provider::init(void)
{
- if (SPConfig::getConfig().getFeatures() == 0 &&
- ShibbolethResolver::init() == false)
- return false;
+ bool ret = false;
- gss_eap_attr_ctx::registerProvider(ATTR_TYPE_LOCAL, createAttrContext);
+ try {
+ if (SPConfig::getConfig().getFeatures() == 0)
+ ret = ShibbolethResolver::init();
+ } catch (exception &e) {
+ }
- return true;
+ if (ret)
+ gss_eap_attr_ctx::registerProvider(ATTR_TYPE_LOCAL, createAttrContext);
+
+ return ret;
}
void
}
void