upstream/haproxy
1
0
Fork 0
mirror of https://github.com/haproxy/haproxy.git synced 2026-04-28 01:26:59 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 12

BUG/MINOR: acl: Fix type of log message when an acl is named 'or'

Browse source 
The patch adding this check initially only issued a warning, instead of
being fatal. It was changed before committing. However when making this
change the type of the log message was not changed from `ha_warning` to
`ha-alert`. This patch makes this forgotten adjustment.

see 0cf811a5f9
No backport needed. The initial patch was backported as a warning, thus
the log message type is correct.
This commit is contained in:
Tim Duesterhus 2020-02-06 22:04:03 +01:00 committed by Willy Tarreau
parent 499b298ce0
commit f1bc24cb27
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/cfgparse-listen.c
View file

@ -808,7 +808,7 @@ int cfg_parse_listen(const char *file, int linenum, char **args, int kwm)
}
if (strcasecmp(args[1], "or") == 0) {
ha_warning("parsing [%s:%d] : acl name '%s' will never match. 'or' is used to express a "
ha_alert("parsing [%s:%d] : acl name '%s' will never match. 'or' is used to express a "
"logical disjunction within a condition.\n",
file, linenum, args[1]);
err_code |= ERR_ALERT | ERR_FATAL;

2
src/fcgi-app.c
View file

@ -888,7 +888,7 @@ static int cfg_parse_fcgi_app(const char *file, int linenum, char **args, int kw
goto out;
}
if (strcasecmp(args[1], "or") == 0) {
ha_warning("parsing [%s:%d] : acl name '%s' will never match. 'or' is used to express a "
ha_alert("parsing [%s:%d] : acl name '%s' will never match. 'or' is used to express a "
"logical disjunction within a condition.\n",
file, linenum, args[1]);
err_code |= ERR_ALERT | ERR_FATAL;

2
src/flt_spoe.c
View file

@ -3992,7 +3992,7 @@ cfg_parse_spoe_message(const char *file, int linenum, char **args, int kwm)
goto out;
}
if (strcasecmp(args[1], "or") == 0) {
ha_warning("parsing [%s:%d] : acl name '%s' will never match. 'or' is used to express a "
ha_alert("parsing [%s:%d] : acl name '%s' will never match. 'or' is used to express a "
"logical disjunction within a condition.\n",
file, linenum, args[1]);
err_code |= ERR_ALERT | ERR_FATAL;