File 0002-remove-debugging.patch of Package kolab-webadmin

File 0002-remove-debugging.patch of Package kolab-webadmin (Revision 602e80ff729b8bcb3b9a336258f7a164)

Currently displaying revision 602e80ff729b8bcb3b9a336258f7a164 , Show latest

From da397091f63d3bfd0cf33165f9128fee47df9f39 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <machniak@kolabsys.com>
Date: Tue, 26 Aug 2014 01:14:26 +0000
Subject: Fix so LDAP internal debug is enabled only when debug_mode=trace (#3535)

---
diff --git a/lib/Auth/LDAP.php b/lib/Auth/LDAP.php
index 7763205..2dfe084 100644
--- a/lib/Auth/LDAP.php
+++ b/lib/Auth/LDAP.php
@@ -43,7 +43,7 @@ class LDAP extends Net_LDAP3 {
         // Causes nesting levels to be too deep...?
         //$this->config_set('config_get_hook', array($this, "_config_get"));
 
-        $this->config_set("debug", true);
+        $this->config_set("debug", Log::mode() == Log::TRACE);
         $this->config_set("log_hook", array($this, "_log"));
 
         $this->config_set("config_root_dn", "cn=config");
@@ -1208,6 +1208,9 @@ class LDAP extends Net_LDAP3 {
                 Log::debug($str . $msg);
                 break;
             case LOG_ERR:
+            case LOG_ALERT:
+            case LOG_CRIT:
+            case LOG_EMERG:
                 Log::error($str . $msg);
                 break;
             case LOG_INFO:
@@ -1216,9 +1219,6 @@ class LDAP extends Net_LDAP3 {
             case LOG_WARNING:
                 Log::warning($str . $msg);
                 break;
-            case LOG_ALERT:
-            case LOG_CRIT:
-            case LOG_EMERG:
             case LOG_NOTICE:
             default:
                 Log::trace($str . $msg);
--
cgit v0.9.0.2