From: Gonzalo Arana <gonzalo.arana@gmail.com>
Date: Wed, 8 May 2013 02:55:07 +0000 (-0600)
Subject: Bug 2179: debug_options ALL,1 3,9 83,9 has no effect
X-Git-Tag: SQUID_3_4_0_1~164
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cd0c9bca2a8313acc07595d82b2c7ffe908cfc9f;p=thirdparty%2Fsquid.git

Bug 2179: debug_options ALL,1 3,9 83,9 has no effect
---

diff --git a/src/cache_cf.cc b/src/cache_cf.cc
index 9bc9b7212d..0f7195eee6 100644
--- a/src/cache_cf.cc
+++ b/src/cache_cf.cc
@@ -3019,6 +3019,21 @@ parse_eol(char *volatile *var)
 #define dump_eol dump_string
 #define free_eol free_string
 
+void
+parse_debug_options(char* volatile* var)
+{
+    parse_eol(var);
+    if (!Config.chroot_dir) {
+        leave_suid();
+        setUmask(Config.umask);
+        _db_init(Debug::cache_log, Debug::debugOptions);
+        enter_suid();
+    }
+}
+
+#define dump_debug_options dump_string
+#define free_debug_options free_string
+
 static void
 dump_time_t(StoreEntry * entry, const char *name, time_t var)
 {
diff --git a/src/cf.data.depend b/src/cf.data.depend
index ece4bf2651..4716a4a001 100644
--- a/src/cf.data.depend
+++ b/src/cf.data.depend
@@ -23,6 +23,7 @@ delay_pool_rates	delay_class
 client_delay_pool_access	acl
 client_delay_pool_count
 client_delay_pool_rates
+debug_options
 denyinfo		acl
 eol
 externalAclHelper	auth_param
diff --git a/src/cf.data.pre b/src/cf.data.pre
index 7ad9637f5e..7fe08c7568 100644
--- a/src/cf.data.pre
+++ b/src/cf.data.pre
@@ -4192,7 +4192,7 @@ DOC_START
 DOC_END
 
 NAME: debug_options
-TYPE: eol
+TYPE: debug_options
 DEFAULT: ALL,1
 DEFAULT_DOC: Log all critical and important messages.
 LOC: Debug::debugOptions