From: Amos Jeffries <squid3@treenet.co.nz>
Date: Sun, 12 May 2013 05:04:14 +0000 (-0600)
Subject: Revert r12797
X-Git-Tag: SQUID_3_4_0_1~154
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7767ab7f7e8ad9eb31bc85e57b0f5966ac811b0b;p=thirdparty%2Fsquid.git

Revert r12797
---

diff --git a/src/cache_cf.cc b/src/cache_cf.cc
index 95f44b88b8..dc7d899356 100644
--- a/src/cache_cf.cc
+++ b/src/cache_cf.cc
@@ -3018,21 +3018,6 @@ 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 4716a4a001..ece4bf2651 100644
--- a/src/cf.data.depend
+++ b/src/cf.data.depend
@@ -23,7 +23,6 @@ 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 a00700ca2e..808063e669 100644
--- a/src/cf.data.pre
+++ b/src/cf.data.pre
@@ -4230,7 +4230,7 @@ DOC_START
 DOC_END
 
 NAME: debug_options
-TYPE: debug_options
+TYPE: eol
 DEFAULT: ALL,1
 DEFAULT_DOC: Log all critical and important messages.
 LOC: Debug::debugOptions