Large reorg of shibsp lib, new SPRequest API, ported modules, shifted code out of...

[shibboleth/sp.git] / shar / shar.cpp

diff --git a/shar/shar.cpp b/shar/shar.cpp
index 0fde514..c224b3c 100644 (file)
--- a/shar/shar.cpp
+++ b/shar/shar.cpp
@@ -114,7 +114,7 @@ int real_main(int preinit)
             SPConfig::Credentials |
             SPConfig::AAP |
             SPConfig::OutOfProcess |
-            (shar_checkonly ? (SPConfig::InProcess | SPConfig::RequestMapper) : SPConfig::Logging)
+            (shar_checkonly ? (SPConfig::InProcess | SPConfig::RequestMapping) : SPConfig::Logging)
             );
         if (!shar_config)
             shar_config=getenv("SHIBCONFIG");
@@ -143,7 +143,7 @@ int real_main(int preinit)
         if (!shar_checkonly) {
 
             // Run the listener.
-            if (!conf.getINI()->getListener()->run(&shibd_shutdown)) {
+            if (!conf.getINI()->getListenerService()->run(&shibd_shutdown)) {
                 fprintf(stderr, "listener failed to enter listen loop\n");
                 return -3;
             }
@@ -258,7 +258,7 @@ int main(int argc, char *argv[])
         SPConfig::Credentials |
         SPConfig::AAP |
         SPConfig::OutOfProcess |
-        (shar_checkonly ? (SPConfig::InProcess | SPConfig::RequestMapper) : SPConfig::Logging)
+        (shar_checkonly ? (SPConfig::InProcess | SPConfig::RequestMapping) : SPConfig::Logging)
         );
     if (!conf.init(shar_schemadir) || !conf.load(shar_config)) {
         fprintf(stderr, "configuration is invalid, check console for specific problems\n");
@@ -281,7 +281,7 @@ int main(int argc, char *argv[])
         }
     
         // Run the listener
-        if (!conf.getINI()->getListener()->run(&shibd_shutdown)) {
+        if (!conf.getINI()->getListenerService()->run(&shibd_shutdown)) {
             fprintf(stderr, "listener failed to enter listen loop\n");
             return -3;
         }