From: Valentine Krasnobaeva <vkrasnobaeva@haproxy.com>
Date: Sat, 12 Oct 2024 12:45:36 +0000 (+0200)
Subject: MINOR: cfgparse-global: parse *env keywords in MODE_DISCOVERY
X-Git-Tag: v3.1-dev10~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d5ad92c7aa37e69bf6681e99365e29a322fa4e25;p=thirdparty%2Fhaproxy.git

MINOR: cfgparse-global: parse *env keywords in MODE_DISCOVERY

setenv/resetenv/presetenv/unsetenv keywords should be parsed by master
process and by worker. As some other master parameters could be enabled in
conditional blocks (.if...endif). To achieve this let's tag '*env' keywords
with KWF_DISCOVERY flag.
---

diff --git a/src/cfgparse-global.c b/src/cfgparse-global.c
index a17bf001a5..daca46ac84 100644
--- a/src/cfgparse-global.c
+++ b/src/cfgparse-global.c
@@ -1577,10 +1577,10 @@ static struct cfg_kw_list cfg_kws = {ILH, {
 	{ CFG_GLOBAL, "tune.disable-zero-copy-forwarding", cfg_parse_global_tune_forward_opts },
 	{ CFG_GLOBAL, "tune.chksize", cfg_parse_global_unsupported_opts },
 	{ CFG_GLOBAL, "nbproc", cfg_parse_global_unsupported_opts },
-	{ CFG_GLOBAL, "setenv", cfg_parse_global_env_opts },
-	{ CFG_GLOBAL, "unsetenv", cfg_parse_global_env_opts },
-	{ CFG_GLOBAL, "resetenv", cfg_parse_global_env_opts },
-	{ CFG_GLOBAL, "presetenv", cfg_parse_global_env_opts },
+	{ CFG_GLOBAL, "setenv", cfg_parse_global_env_opts, KWF_DISCOVERY },
+	{ CFG_GLOBAL, "unsetenv", cfg_parse_global_env_opts, KWF_DISCOVERY },
+	{ CFG_GLOBAL, "resetenv", cfg_parse_global_env_opts, KWF_DISCOVERY },
+	{ CFG_GLOBAL, "presetenv", cfg_parse_global_env_opts, KWF_DISCOVERY },
 	{ 0, NULL, NULL },
 }};