]> git.ipfire.org Git - thirdparty/squid.git/commitdiff
Bug 5319: QOS Netfilter MARK preservation is always disabled (#1585)
authorNicolai Moore <niconorsk@gmail.com>
Wed, 15 Nov 2023 00:59:59 +0000 (00:59 +0000)
committerSquid Anubis <squid-anubis@squid-cache.org>
Wed, 15 Nov 2023 03:26:41 +0000 (03:26 +0000)
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

index 5e5939526ab7f9cc20c27e158e2142219e0e7935..57c5cdafc6fc59b751337f01055d40b0100c36a1 100644 (file)
@@ -2852,7 +2852,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])