From: Willy Tarreau <w@1wt.eu>
Date: Fri, 16 Jul 2021 17:14:54 +0000 (+0200)
Subject: MINOR: init: make -cc support environment variables expansion
X-Git-Tag: v2.5-dev2~15
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a87e782a2dfb0837e863867a5e3361143eaede9b;p=thirdparty%2Fhaproxy.git

MINOR: init: make -cc support environment variables expansion

I found myself a few times testing some conditoin examples from the doc
against command line's "-cc" to see that they didn't work with environment
variables expansion. Not being documented as being on purpose it looks like
a miss, so let's add PARSE_OPT_ENV and PARSE_OPT_WORD_EXPAND to be able to
test for example -cc "streq(${WITH_SSL},yes)" to help debug expressions.
---

diff --git a/src/haproxy.c b/src/haproxy.c
index 8a9f50cf8c..2d32bb84f6 100644
--- a/src/haproxy.c
+++ b/src/haproxy.c
@@ -1808,7 +1808,7 @@ static void init(int argc, char **argv)
 		size_t outlen = strlen(check_condition) + 1;
 
 		err = parse_line(check_condition, check_condition, &outlen, args, &arg,
-		                 PARSE_OPT_DQUOTE | PARSE_OPT_SQUOTE | PARSE_OPT_BKSLASH,
+		                 PARSE_OPT_ENV | PARSE_OPT_WORD_EXPAND | PARSE_OPT_DQUOTE | PARSE_OPT_SQUOTE | PARSE_OPT_BKSLASH,
 		                 &errptr);
 
 		if (err & PARSE_ERR_QUOTE) {