From f1bc24cb27483e1b85e0a0a3b7d2dc7a61d8b227 Mon Sep 17 00:00:00 2001 From: Tim Duesterhus Date: Thu, 6 Feb 2020 22:04:03 +0100 Subject: [PATCH] BUG/MINOR: acl: Fix type of log message when an acl is named 'or' 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 0cf811a5f941261176b67046dbc542d0479ff4a7 No backport needed. The initial patch was backported as a warning, thus the log message type is correct. --- src/cfgparse-listen.c | 2 +- src/fcgi-app.c | 2 +- src/flt_spoe.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/cfgparse-listen.c b/src/cfgparse-listen.c index 77a5d5b8f..6d9c1f52e 100644 --- a/src/cfgparse-listen.c +++ b/src/cfgparse-listen.c @@ -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; diff --git a/src/fcgi-app.c b/src/fcgi-app.c index 7b28e3a9c..a9466a577 100644 --- a/src/fcgi-app.c +++ b/src/fcgi-app.c @@ -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; diff --git a/src/flt_spoe.c b/src/flt_spoe.c index 06c70d24f..4e448dd11 100644 --- a/src/flt_spoe.c +++ b/src/flt_spoe.c @@ -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;