From: Amos Jeffries <squid3@treenet.co.nz>
Date: Fri, 2 Oct 2009 10:17:38 +0000 (+1300)
Subject: Bug 2724: alLogformatHasIcapToken exposed with --enable-ecap
X-Git-Tag: SQUID_3_2_0_1~674
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=19100acf20634fa4839fd8ab730d748ff03256bf;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 d71baee48f..1f04f346c3 100644
--- a/src/access_log.cc
+++ b/src/access_log.cc
@@ -2058,9 +2058,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 ||