From 037a8ffb291f2bade5204658c79af93b5152543d Mon Sep 17 00:00:00 2001 From: Nicolai Moore Date: Wed, 15 Nov 2023 00:59:59 +0000 Subject: [PATCH] Bug 5319: QOS Netfilter MARK preservation is always disabled (#1585) Default ./configure options and explicit --enable-zph-qos enabled ZPH QOS support (USE_QOS_TOS) as expected but did not enable QOS Netfilter MARK preservation support (USE_LIBNETFILTERCONNTRACK). For example, qos_flows directive became available, but clientside_mark and client_connection_mark ACL types were not recognized. The missing opening bracket before AS_IF() condition injected a trailing closing bracket into that condition, resulting in an always-false condition for setting USE_LIBNETFILTERCONNTRACK. Broken since 2022 commit a1c2236. --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 412d6b1cfe..aac6cab5a2 100644 --- a/configure.ac +++ b/configure.ac @@ -2965,7 +2965,7 @@ SQUID_DEFINE_BOOL(USE_QOS_TOS,${enable_zph_qos:=yes}, [Enable Zero Penalty Hit QOS. When set, Squid will alter the TOS field of HIT responses to help policing network traffic]) AC_MSG_NOTICE([ZPH QOS enabled: $enable_zph_qos]) -AS_IF(test "x$enable_zph_qos" = "xyes"],[ +AS_IF([test "x$enable_zph_qos" = "xyes"],[ AC_MSG_NOTICE([QOS netfilter mark preservation enabled: $with_netfilter_conntrack]) SQUID_DEFINE_BOOL(USE_LIBNETFILTERCONNTRACK,${with_netfilter_conntrack:=no}, [Enable support for QOS netfilter mark preservation]) -- 2.47.2