Only default logging when feature enabled.

git-svn-id: https://svn.shibboleth.net/cpp-sp/branches/REL_2@3644 cb58f699-b61c-0410-a6fe-9272a202ed29

diff --git a/shibsp/SPConfig.cpp b/shibsp/SPConfig.cpp
index 13ca623..0e42344 100644 (file)
--- a/shibsp/SPConfig.cpp
+++ b/shibsp/SPConfig.cpp
@@ -185,9 +185,9 @@ bool SPConfig::init(const char* catalog_path, const char* inst_prefix)
 
     const char* logconf = getenv("SHIBSP_LOGGING");
     if (!logconf || !*logconf) {
-        if (isEnabled(SPConfig::OutOfProcess) && !isEnabled(SPConfig::InProcess))
+        if (isEnabled(SPConfig::Logging) && isEnabled(SPConfig::OutOfProcess) && !isEnabled(SPConfig::InProcess))
             logconf = SHIBSP_OUTOFPROC_LOGGING;
-        else if (isEnabled(SPConfig::InProcess) && !isEnabled(SPConfig::OutOfProcess))
+        else if (isEnabled(SPConfig::Logging) && isEnabled(SPConfig::InProcess) && !isEnabled(SPConfig::OutOfProcess))
             logconf = SHIBSP_INPROC_LOGGING;
         else
             logconf = SHIBSP_LOGGING;