From: William Lallemand <wlallemand@haproxy.com>
Date: Thu, 9 Nov 2023 14:02:13 +0000 (+0100)
Subject: MEDIUM: mworker: -W is mandatory when using -S
X-Git-Tag: v2.9-dev10~114
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3ac3a06963e0b33fa0d1cab511c865432eb9b665;p=thirdparty%2Fhaproxy.git

MEDIUM: mworker: -W is mandatory when using -S

Defining a master CLI without the master-worker mode emits a warning
since version 1.8. This patch enforce the behavior by forbiding the
usage of the -S option without the master-worker mode.
---

diff --git a/src/haproxy.c b/src/haproxy.c
index 7a4f49fa69..363cbdab27 100644
--- a/src/haproxy.c
+++ b/src/haproxy.c
@@ -2250,7 +2250,8 @@ static void init(int argc, char **argv)
 	}
 
 	if (!LIST_ISEMPTY(&mworker_cli_conf) && !(arg_mode & MODE_MWORKER)) {
-		ha_warning("a master CLI socket was defined, but master-worker mode (-W) is not enabled.\n");
+		ha_alert("a master CLI socket was defined, but master-worker mode (-W) is not enabled.\n");
+		exit(EXIT_FAILURE);
 	}
 
 	/* destroy unreferenced defaults proxies  */