From: Krzysztof Piotr Oledzki <ole@ans.pl>
Date: Sun, 4 Oct 2009 22:23:35 +0000 (+0200)
Subject: [MINOR] acl: don't report valid acls as potential mistakes
X-Git-Tag: v1.3.21~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=59dd3fc338d1867d3268d059bf060f063fe605e7;p=thirdparty%2Fhaproxy.git

[MINOR] acl: don't report valid acls as potential mistakes

Commit 404e8ab4615d564a74f92a0d3822b0292dd6224f introduced
smart checking for stupid acl typos. However, now haproxy shows
the warning even for valid acls, like this one:
	acl Cookie-X-NoAccel    hdr_reg(cookie) (^|\ |;)X-NoAccel=1(;|$)
(cherry picked from commit 4cdd8314e949f1c31f86331a1122c3ec9ff7c233)
---

diff --git a/src/acl.c b/src/acl.c
index f69424fb69..da26d8bac6 100644
--- a/src/acl.c
+++ b/src/acl.c
@@ -766,7 +766,7 @@ struct acl *parse_acl(const char **args, struct list *known_acl)
 	 * subject, as this is almost certainly a typo. Right now we can only
 	 * emit a warning, so let's do so.
 	 */
-	if (*args[2] == '(')
+	if (!strchr(args[1], '(') && *args[2] == '(')
 		Warning("parsing acl '%s' :\n"
 			"  matching '%s' for pattern '%s' is likely a mistake and probably\n"
 			"  not what you want. Maybe you need to remove the extraneous space before '('.\n"