From: William Lallemand <wlallemand@haproxy.com>
Date: Thu, 4 Jun 2020 21:41:29 +0000 (+0200)
Subject: BUG/MINOR: init: -x can have a parameter starting with a dash
X-Git-Tag: v2.2-dev9~152
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4f71d304aad5199d9a0179deb34241b4a3665740;p=thirdparty%2Fhaproxy.git

BUG/MINOR: init: -x can have a parameter starting with a dash

There is no reason the -x option can't take an argument which starts with
a -. This limitation must only be used for options that take a
non-finite list of parameters (-sf/-st)

This can be backported only if the previous patch which fixes
copy_argv() is backported too.

Could be backported as far as 1.8.
---

diff --git a/src/haproxy.c b/src/haproxy.c
index 3727486bbc..ed971a46e4 100644
--- a/src/haproxy.c
+++ b/src/haproxy.c
@@ -1868,7 +1868,7 @@ static void init(int argc, char **argv)
 			else if (*flag == 'q')
 				arg_mode |= MODE_QUIET;
 			else if (*flag == 'x') {
-				if (argc <= 1 || argv[1][0] == '-') {
+				if (argc <= 1) {
 					ha_alert("Unix socket path expected with the -x flag\n\n");
 					usage(progname);
 				}