From 2bbbac4547014c2d54e7c83a2696d8f9e39934b4 Mon Sep 17 00:00:00 2001 From: Scott Cantor Date: Mon, 20 Sep 2010 23:06:42 +0000 Subject: [PATCH] Fix up feature options for different builds. --- shibresolver/resolver.cpp | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/shibresolver/resolver.cpp b/shibresolver/resolver.cpp index 4a54db2..2164f82 100644 --- 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) { - 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)) -- 2.1.4