From: Willy Tarreau <w@1wt.eu>
Date: Wed, 7 Oct 2026 14:24:32 +0000 (+0200)
Subject: CLEANUP: cfgparse-global: move "external-check" to its own parser
X-Git-Tag: v3.5-dev9~151
X-Git-Url: https://git.kaiwu.me/$%7BISSUES%7D/static/gitweb.js?a=commitdiff_plain;h=bd96322cdbf553c945f95f112aed93dc2e7179fd;p=haproxy.git

CLEANUP: cfgparse-global: move "external-check" to its own parser

The keyword is now registered in cfg_kws and parsed by
cfg_parse_global_external_check(), making it discoverable via "-dKcfg".
---

diff --git a/src/cfgparse-global.c b/src/cfgparse-global.c
index a256f22f2..fe11821a7 100644
--- a/src/cfgparse-global.c
+++ b/src/cfgparse-global.c
@@ -36,7 +36,7 @@ int cluster_secret_isset;
  * registered anywhere. They are used as suggestions for mistyped words.
  */
 static const char *common_kw_list[] = {
-	"global", "external-check", "maxconn",
+	"global", "maxconn",
 	"ssl-server-verify", "maxconnrate", "maxsessrate", "maxsslrate",
 	"maxcomprate", "maxpipes", "maxzlibmem", "maxcompcpuusage", "ulimit-n",
 	"description", "node", "unix-bind", "log",
@@ -96,18 +96,6 @@ int cfg_parse_global(const char *file, int linenum, char **args, int kwm)
 		memcpy(global.cluster_secret, sha1_out, sizeof global.cluster_secret);
 		cluster_secret_isset = 1;
 	}
-	else if (strcmp(args[0], "external-check") == 0) {
-		if (alertif_too_many_args(1, file, linenum, args, &err_code))
-			goto out;
-		global.external_check = 1;
-		if (strcmp(args[1], "preserve-env") == 0) {
-			global.external_check = 2;
-		} else if (*args[1]) {
-			ha_alert("parsing [%s:%d] : '%s' only supports 'preserve-env' as an argument, found '%s'.\n", file, linenum, args[0], args[1]);
-			err_code |= ERR_ALERT | ERR_FATAL;
-	                goto out;
-		}
-	}
 	else if (strcmp(args[0], "maxconn") == 0) {
 		char *stop;
 
@@ -1988,10 +1976,30 @@ static int cfg_parse_global_uid_gid(char **args, int section_type, struct proxy
 	return 0;
 }
 
+/* Parses the "external-check" keyword. */
+static int cfg_parse_global_external_check(char **args, int section_type, struct proxy *curpx,
+                                           const struct proxy *defpx, const char *file, int line,
+                                           char **err)
+{
+	if (too_many_args(1, args, err, NULL))
+		return -1;
+
+	global.external_check = 1;
+	if (strcmp(args[1], "preserve-env") == 0)
+		global.external_check = 2;
+	else if (*args[1]) {
+		memprintf(err, "'%s' only supports 'preserve-env' as an argument, found '%s'.", args[0], args[1]);
+		return -1;
+	}
+
+	return 0;
+}
+
 static struct cfg_kw_list cfg_kws = {ILH, {
 	{ CFG_GLOBAL, "busy-polling", cfg_parse_global_bool_opts },
 	{ CFG_GLOBAL, "chroot", cfg_parse_global_chroot },
 	{ CFG_GLOBAL, "daemon", cfg_parse_global_mode, KWF_DISCOVERY } ,
+	{ CFG_GLOBAL, "external-check", cfg_parse_global_external_check },
 	{ CFG_GLOBAL, "expose-deprecated-directives", cfg_parse_global_non_std_directives, KWF_DISCOVERY },
 	{ CFG_GLOBAL, "expose-experimental-directives", cfg_parse_global_non_std_directives },
 	{ CFG_GLOBAL, "force-cfg-parser-pause", cfg_parse_global_parser_pause, KWF_EXPERIMENTAL },