From: Willy Tarreau <w@1wt.eu>
Date: Tue, 5 Jul 2022 13:54:09 +0000 (+0200)
Subject: BUG/MINOR: peers/config: always fill the bind_conf's argument
X-Git-Tag: v2.7-dev2~98
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8d158132bde98e8dfacb54d685c33eb2a982a26c;p=thirdparty%2Fhaproxy.git

BUG/MINOR: peers/config: always fill the bind_conf's argument

Some generic frontend errors mention the bind_conf by its name as
"bind '%s'", but if this is used on peers "bind" lines it shows
"(null)" because the argument is set to NULL in the call to
bind_conf_uniq_alloc() instead of passing the argument. Fortunately
that's trivial to fix.

This may be backported to older versions.
---

diff --git a/src/cfgparse.c b/src/cfgparse.c
index 72512d8984..a98ebd58d5 100644
--- a/src/cfgparse.c
+++ b/src/cfgparse.c
@@ -703,7 +703,7 @@ int cfg_parse_peers(const char *file, int linenum, char **args, int kwm)
 		}
 
 		bind_conf = bind_conf_uniq_alloc(curpeers->peers_fe, file, linenum,
-		                                 NULL, xprt_get(XPRT_RAW));
+		                                 args[1], xprt_get(XPRT_RAW));
 		if (*args[0] == 'b') {
 			struct listener *l;