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.

(cherry picked from commit 4f71d304aad5199d9a0179deb34241b4a3665740)
Signed-off-by: William Lallemand <wlallemand@haproxy.org>

diff --git a/src/haproxy.c b/src/haproxy.c
index d81d3a2..f1263bf 100644 (file)
--- a/src/haproxy.c
+++ b/src/haproxy.c
@@ -1811,7 +1811,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);
                                }