From 785f6c48bf50c42c690d5d6090520c3dbff49c61 Mon Sep 17 00:00:00 2001 From: Willy Tarreau Date: Fri, 12 Feb 2021 13:28:22 +0100 Subject: [PATCH] BUG/MINOR: cfgparse: do not mention "addr:port" as supported on proxy lines The very old error message indicating that a proxy name is mandatory still had a reference to the optional addr:port argument while this one is explicitly rejected a few lines later since at least 1.9. This is harmless but confusing. This can be backported to 2.0. (cherry picked from commit b2ec994523067bc03c0e631e4f5d4ba8dae02cb9) Signed-off-by: Christopher Faulet (cherry picked from commit a3201bc5dbf5a837cbd9c25d0c795868f236871a) Signed-off-by: Christopher Faulet (cherry picked from commit 0ca103d643981c935f0c64eb5995be4d15a646d8) Signed-off-by: Christopher Faulet --- src/cfgparse-listen.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/cfgparse-listen.c b/src/cfgparse-listen.c index 3dbd46b..b85a51e 100644 --- a/src/cfgparse-listen.c +++ b/src/cfgparse-listen.c @@ -187,8 +187,7 @@ int cfg_parse_listen(const char *file, int linenum, char **args, int kwm) if (rc != PR_CAP_NONE) { /* new proxy */ if (!*args[1]) { - ha_alert("parsing [%s:%d] : '%s' expects an argument and\n" - " optionally supports [addr1]:port1[-end1]{,[addr]:port[-end]}...\n", + ha_alert("parsing [%s:%d] : '%s' expects an argument\n", file, linenum, args[0]); err_code |= ERR_ALERT | ERR_ABORT; goto out; -- 1.7.10.4