From: Christopher Faulet <cfaulet@haproxy.com>
Date: Fri, 24 Nov 2023 08:23:04 +0000 (+0100)
Subject: BUG/MINOR: global: Fix tune.disable-(fast-forward/zero-copy-forwarding) options
X-Git-Tag: v2.9-dev12~106
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=671e07617c1a3a9b8fd6310c522d0125c27e3216;p=thirdparty%2Fhaproxy.git

BUG/MINOR: global: Fix tune.disable-(fast-forward/zero-copy-forwarding) options

These options were not properly handled during configration parsing. A wrong
bitwise operation was used.

No backport needed.
---

diff --git a/src/cfgparse-global.c b/src/cfgparse-global.c
index 9e7e3324bc..a80ac854f6 100644
--- a/src/cfgparse-global.c
+++ b/src/cfgparse-global.c
@@ -515,12 +515,12 @@ int cfg_parse_global(const char *file, int linenum, char **args, int kwm)
 
 		if (alertif_too_many_args(0, file, linenum, args, &err_code))
 			goto out;
-		global.tune.options &= GTUNE_USE_FAST_FWD;
+		global.tune.options &= ~GTUNE_USE_FAST_FWD;
 	}
 	else if (strcmp(args[0], "tune.disable-zero-copy-forwarding") == 0) {
 		if (alertif_too_many_args(0, file, linenum, args, &err_code))
 			goto out;
-		global.tune.options &= GTUNE_USE_ZERO_COPY_FWD;
+		global.tune.options &= ~GTUNE_USE_ZERO_COPY_FWD;
 	}
 	else if (strcmp(args[0], "cluster-secret") == 0) {
 		blk_SHA_CTX sha1_ctx;