From: William Lallemand <wlallemand@haproxy.com>
Date: Tue, 14 Jan 2020 14:25:02 +0000 (+0100)
Subject: BUG/MINOR: cli/mworker: can't start haproxy with 2 programs
X-Git-Tag: v2.2-dev1~115
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a31b09e982a76cdf8761edb25d1569cb76a8ff37;p=thirdparty%2Fhaproxy.git

BUG/MINOR: cli/mworker: can't start haproxy with 2 programs

When trying to start HAProxy with the master CLI and more than one
program in the configuration, it refuses to start with:

[ALERT] 013/132926 (1378) : parsing [cur--1:0] : proxy 'MASTER', another server named 'cur--1' was already defined at line 0, please use distinct names.
[ALERT] 013/132926 (1378) : Fatal errors found in configuration.

The problem is that haproxy tries to create a server for the MASTER
proxy but only the worker are supposed to be in the server list.

Fix issue #446.

Must be backported as far as 2.0.
---

diff --git a/src/cli.c b/src/cli.c
index ba48d14726..e1c8bdcbc1 100644
--- a/src/cli.c
+++ b/src/cli.c
@@ -2453,6 +2453,10 @@ int mworker_cli_proxy_create()
 		int port1, port2, port;
 		struct protocol *proto;
 
+		/* only the workers support the master CLI */
+		if (!(child->options & PROC_O_TYPE_WORKER))
+			continue;
+
 		newsrv = new_server(mworker_proxy);
 		if (!newsrv)
 			goto error;