]> git.ipfire.org Git - thirdparty/haproxy.git/commitdiff
MINOR: cli: don't add a semicolon at the end of HAPROXY_CLI
authorWilliam Lallemand <wlallemand@haproxy.com>
Fri, 12 Apr 2019 14:09:25 +0000 (16:09 +0200)
committerWilly Tarreau <w@1wt.eu>
Tue, 16 Apr 2019 11:26:43 +0000 (13:26 +0200)
Only add the semicolon when there is several CLI in HAPROXY_CLI and
HAPROXY_MASTER_CLI.

src/cli.c

index e21c7d21b32fb5dce92705086ca8e33560749dd6..568ceba2e78e6d68af809b4ee8fa48f7e56195ad 100644 (file)
--- a/src/cli.c
+++ b/src/cli.c
@@ -391,6 +391,10 @@ int listeners_setenv(struct proxy *frontend, const char *varname)
                                char addr[46];
                                char port[6];
 
+                               /* separate listener by semicolons */
+                               if (trash->data)
+                                       chunk_appendf(trash, ";");
+
                                if (l->addr.ss_family == AF_UNIX) {
                                        const struct sockaddr_un *un;
 
@@ -411,8 +415,6 @@ int listeners_setenv(struct proxy *frontend, const char *varname)
                                } else if (l->addr.ss_family == AF_CUST_SOCKPAIR) {
                                        chunk_appendf(trash, "sockpair@%d", ((struct sockaddr_in *)&l->addr)->sin_addr.s_addr);
                                }
-                               /* separate listener by semicolons */
-                               trash->area[trash->data++] = ';';
                        }
                }
                trash->area[trash->data++] = '\0';