From: Scott Cantor <cantor.2@osu.edu>
Date: Sat, 28 May 2011 22:27:23 +0000 (+0000)
Subject: Fix feature defaulting.
X-Git-Tag: 1.0.0~12
X-Git-Url: http://www.project-moonshot.org/gitweb/?p=shibboleth%2Fcpp-sp-resolver.git;a=commitdiff_plain;h=32c43270d4ace5ecb83cb3c514640cfd0dc0aab4

Fix feature defaulting.
---

diff --git a/src/shibresolver/resolver.cpp b/src/shibresolver/resolver.cpp
index d14600a..c23dc63 100644
--- a/src/shibresolver/resolver.cpp
+++ b/src/shibresolver/resolver.cpp
@@ -587,14 +587,14 @@ const RoleDescriptor* RemotedResolver::lookup(
 
 bool ShibbolethResolver::init(unsigned long features, const char* config, bool rethrow)
 {
-    if (features && SPConfig::OutOfProcess) {
+    if (features & SPConfig::OutOfProcess) {
 #ifndef SHIBSP_LITE
         features = features | SPConfig::AttributeResolution | SPConfig::Metadata | SPConfig::Trust | SPConfig::Credentials;
 #endif
-        if (!(features && SPConfig::InProcess))
+        if (!(features & SPConfig::InProcess))
             features |= SPConfig::Listener;
     }
-    else if (features && SPConfig::InProcess) {
+    else if (features & SPConfig::InProcess) {
         features |= SPConfig::Listener;
     }
     SPConfig::getConfig().setFeatures(features);