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 d71baee48f82cbcae16d364a823c9556bec756cc..1f04f346c338aed1424ba17aea91d8770fa1380f 100644 (file)
--- 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 ||