projects
/
shibboleth
/
cpp-sp-resolver.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
b6622bf
)
Fix up feature options for different builds.
author
Scott Cantor
<cantor.2@osu.edu>
Mon, 20 Sep 2010 23:06:42 +0000
(23:06 +0000)
committer
Scott Cantor
<cantor.2@osu.edu>
Mon, 20 Sep 2010 23:06:42 +0000
(23:06 +0000)
shibresolver/resolver.cpp
patch
|
blob
|
history
diff --git
a/shibresolver/resolver.cpp
b/shibresolver/resolver.cpp
index
4a54db2
..
2164f82
100644
(file)
--- a/
shibresolver/resolver.cpp
+++ b/
shibresolver/resolver.cpp
@@
-125,7
+125,17
@@
void RemotedResolver::receive(DDF& in, ostream& out)
bool ShibbolethResolver::init(unsigned long features, const char* config, bool rethrow)
{
bool ShibbolethResolver::init(unsigned long features, const char* config, bool rethrow)
{
- SPConfig::getConfig().setFeatures(features | SPConfig::AttributeResolution | SPConfig::Metadata | SPConfig::Trust);
+ if (features && SPConfig::OutOfProcess) {
+#ifndef SHIBSP_LITE
+ features = features | SPConfig::AttributeResolution | SPConfig::Metadata | SPConfig::Trust | SPConfig::Credentials;
+#endif
+ if (!(features && SPConfig::InProcess))
+ features |= SPConfig::Listener;
+ }
+ else if (features && SPConfig::InProcess) {
+ features |= SPConfig::Listener;
+ }
+ SPConfig::getConfig().setFeatures(features);
if (!SPConfig::getConfig().init())
return false;
if (!SPConfig::getConfig().instantiate(config, rethrow))
if (!SPConfig::getConfig().init())
return false;
if (!SPConfig::getConfig().instantiate(config, rethrow))