[cpp-sp COMMIT] /branches/REL_2/shibsp/SPConfig.cpp

[noreply at shibboleth.net]

Author: scantor
Date: Fri May  4 22:10:41 2012
New Revision: 3644

URL: http://svn.shibboleth.net/view/cpp-sp?rev=3644&view=rev
Log:
Only default logging when feature enabled.

Modified:
    branches/REL_2/shibsp/SPConfig.cpp

Modified: branches/REL_2/shibsp/SPConfig.cpp
URL: http://svn.shibboleth.net/view/cpp-sp/branches/REL_2/shibsp/SPConfig.cpp?rev=3644&r1=3643&r2=3644&view=diff
==============================================================================
--- branches/REL_2/shibsp/SPConfig.cpp (original)
+++ branches/REL_2/shibsp/SPConfig.cpp Fri May  4 22:10:41 2012
@@ -185,9 +185,9 @@
 
     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;