Add Handler feature for config.

[shibboleth/cpp-sp.git] / shibd / shibd.cpp

diff --git a/shibd/shibd.cpp b/shibd/shibd.cpp
index bf8a95f..f5ed3a6 100644 (file)
--- a/shibd/shibd.cpp
+++ b/shibd/shibd.cpp
@@ -44,7 +44,6 @@
 \r
 #include <stdio.h>\r
 #include <signal.h>\r
-#include <log4cpp/Category.hh>\r
 #include <shibsp/ServiceProvider.h>\r
 #include <shibsp/remoting/ListenerService.h>\r
 #include <xercesc/util/XMLUniDefs.hpp>\r
@@ -53,7 +52,6 @@
 #include <xmltooling/util/XMLHelper.h>\r
 \r
 using namespace shibsp;\r
-using namespace log4cpp;\r
 using namespace xmltooling;\r
 using namespace std;\r
 \r
@@ -116,8 +114,9 @@ int real_main(int preinit)
             SPConfig::Trust |\r
             SPConfig::Credentials |\r
             SPConfig::AttributeResolution |\r
+            SPConfig::Handlers |\r
             SPConfig::OutOfProcess |\r
-            (shar_checkonly ? (SPConfig::InProcess | SPConfig::RequestMapping) : SPConfig::Logging)\r
+            (shar_checkonly ? SPConfig::RequestMapping : SPConfig::Logging)\r
             );\r
         if (!shar_config)\r
             shar_config=getenv("SHIBSP_CONFIG");\r
@@ -280,8 +279,9 @@ int main(int argc, char *argv[])
         SPConfig::Trust |\r
         SPConfig::Credentials |\r
         SPConfig::AttributeResolution |\r
+        SPConfig::Handlers |\r
         SPConfig::OutOfProcess |\r
-        (shar_checkonly ? (SPConfig::InProcess | SPConfig::RequestMapping) : SPConfig::Logging)\r
+        (shar_checkonly ? SPConfig::RequestMapping : SPConfig::Logging)\r
         );\r
     if (!conf.init(shar_schemadir)) {\r
         fprintf(stderr, "configuration is invalid, check console for specific problems\n");\r