projects
/
cyrus-sasl.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
b31a59e
)
cleanup
author
Luke Howard
<lukeh@padl.com>
Mon, 20 Sep 2010 14:55:15 +0000
(16:55 +0200)
committer
Luke Howard
<lukeh@padl.com>
Mon, 20 Sep 2010 14:55:15 +0000
(16:55 +0200)
mech_eap/util_shib.cpp
patch
|
blob
|
history
diff --git
a/mech_eap/util_shib.cpp
b/mech_eap/util_shib.cpp
index
3d028b8
..
8da0bbc
100644
(file)
--- 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)
{
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;
if (!ShibbolethResolver::init())
return false;
-#endif
gss_eap_attr_ctx::registerProvider(ATTR_TYPE_LOCAL,
NULL,
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);
gss_eap_shib_attr_provider::finalize(void)
{
gss_eap_attr_ctx::unregisterProvider(ATTR_TYPE_LOCAL);
-
//
ShibbolethResolver::term();
+ ShibbolethResolver::term();
}
gss_eap_attr_provider *
}
gss_eap_attr_provider *