From: Amos Jeffries <squid3@treenet.co.nz>
Date: Tue, 27 Oct 2009 05:56:45 +0000 (+1300)
Subject: Bug 2724: alLogformatHasIcapToken exposed with --enable-ecap
X-Git-Tag: SQUID_3_1_0_15~57
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a6c236bfa0fd3ad83e277cc1ce3d4f0a56e9e919;p=thirdparty%2Fsquid.git

Bug 2724: alLogformatHasIcapToken exposed with --enable-ecap

Wrapping logic error opened the initialization of this ICAP-only variable
to be set when eCAP-only builds enabled adaptation.
---

diff --git a/src/access_log.cc b/src/access_log.cc
index 590f86477c..bf31a424c5 100644
--- a/src/access_log.cc
+++ b/src/access_log.cc
@@ -2049,9 +2049,13 @@ accessLogInit(void)
 
         LogfileStatus = LOG_ENABLE;
 
-#if USE_ADAPTATION || ICAP_CLIENT
+#if USE_ADAPTATION
         alLogformatHasAdaptToken = false;
+#endif
+#if ICAP_CLIENT
         alLogformatHasIcapToken = false;
+#endif
+#if USE_ADAPTATION || ICAP_CLIENT
         for (logformat_token * curr_token = (log->logFormat?log->logFormat->format:NULL); curr_token; curr_token = curr_token->next) {
 #if USE_ADAPTATION
             if (curr_token->type == LTF_ADAPTATION_SUM_XACT_TIMES ||