BUG/MINOR: cfgparse: do not mention "addr:port" as supported on proxy lines
authorWilly Tarreau <w@1wt.eu>
Fri, 12 Feb 2021 12:28:22 +0000 (13:28 +0100)
committerChristopher Faulet <cfaulet@haproxy.com>
Fri, 26 Feb 2021 15:54:29 +0000 (16:54 +0100)
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 <cfaulet@haproxy.com>
(cherry picked from commit a3201bc5dbf5a837cbd9c25d0c795868f236871a)
Signed-off-by: Christopher Faulet <cfaulet@haproxy.com>
(cherry picked from commit 0ca103d643981c935f0c64eb5995be4d15a646d8)
Signed-off-by: Christopher Faulet <cfaulet@haproxy.com>

src/cfgparse-listen.c

index 3dbd46b..b85a51e 100644 (file)
@@ -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 <id> argument and\n"
-                                "  optionally supports [addr1]:port1[-end1]{,[addr]:port[-end]}...\n",
+                       ha_alert("parsing [%s:%d] : '%s' expects an <id> argument\n",
                                 file, linenum, args[0]);
                        err_code |= ERR_ALERT | ERR_ABORT;
                        goto out;