Fix up feature options for different builds.

[shibboleth/cpp-sp-resolver.git] / shibresolver / resolver.cpp

diff --git a/shibresolver/resolver.cpp b/shibresolver/resolver.cpp
index f8acdc7..2164f82 100644 (file)
--- a/shibresolver/resolver.cpp
+++ b/shibresolver/resolver.cpp
@@ -53,6 +53,8 @@ ShibbolethResolver* ShibbolethResolver::create()
 
 ShibbolethResolver::ShibbolethResolver()
 {
+    m_mapper = NULL;
+    m_sp = NULL;
 }
 
 ShibbolethResolver::~ShibbolethResolver()
@@ -123,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))