From: William Lallemand <wlallemand@haproxy.com>
Date: Thu, 17 Oct 2024 10:17:23 +0000 (+0200)
Subject: BUG/MINOR: resolvers/mworker: missing default resolvers in mworker mode
X-Git-Tag: v3.1-dev11~123
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5184f3fb30a4ee290bc43e67809bb64538eb2cc4;p=thirdparty%2Fhaproxy.git

BUG/MINOR: resolvers/mworker: missing default resolvers in mworker mode

Since commit fe75c1e12da061 ("MEDIUM: startup: remove
MODE_MWORKER_WAIT") the MODE_MWORKER_WAIT constant disappeared. The
initialization of the default resolvers section was conditionned by this
constant.

The section must be created in mworker mode, but only in the worker not in
the master. It was currently completely disabled in both the master and
the worker which could break configuration using it, as well as the
httpclient.

No backport needed.
---

diff --git a/src/resolvers.c b/src/resolvers.c
index 63d3791692..ed96c4eb5c 100644
--- a/src/resolvers.c
+++ b/src/resolvers.c
@@ -3841,7 +3841,8 @@ int resolvers_create_default()
 {
 	int err_code = ERR_NONE;
 
-	if (global.mode & MODE_MWORKER) /* does not create the section if in MODE_MWORKER */
+	/* does not create the section if in master process */
+	if (master)
 		return ERR_NONE;
 
 	/* if the section already exists, do nothing */