From: Scott Cantor <cantor.2@osu.edu>
Date: Mon, 20 Sep 2010 23:06:42 +0000 (+0000)
Subject: Fix up feature options for different builds.
X-Git-Tag: 1.0.0~36
X-Git-Url: http://www.project-moonshot.org/gitweb/?p=shibboleth%2Fcpp-sp-resolver.git;a=commitdiff_plain;h=2bbbac4547014c2d54e7c83a2696d8f9e39934b4

Fix up feature options for different builds.
---

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))