From 8c555a4a4ee96d11d07bc800bf09a6bb970ea7e1 Mon Sep 17 00:00:00 2001 From: Christopher Faulet Date: Mon, 1 Sep 2025 21:36:22 +0200 Subject: [PATCH] BUG/MINOR: acl: Properly detect overwritten matching method A bug was introduced by the commit 6ea50ba46 ("MINOR: acl; Warn when matching method based on a suffix is overwritten"). The test on the match function, when defined was not correct. It is now fixed. No backport needed, except if the commit above is backported. --- src/acl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/acl.c b/src/acl.c index 71cdb5b89..9325257f9 100644 --- a/src/acl.c +++ b/src/acl.c @@ -410,7 +410,7 @@ struct acl_expr *parse_acl_expr(const char **args, char **err, struct arg_list * if (((aclkw->match_type == PAT_MATCH_BEG || aclkw->match_type == PAT_MATCH_DIR || aclkw->match_type == PAT_MATCH_DOM || aclkw->match_type == PAT_MATCH_DOM || aclkw->match_type == PAT_MATCH_END || aclkw->match_type == PAT_MATCH_LEN || aclkw->match_type == PAT_MATCH_REG) && expr->pat.match != pat_match_fcts[aclkw->match_type]) || - (aclkw->match && expr->pat.match != pat_match_fcts[aclkw->match_type])) + (aclkw->match && expr->pat.match != aclkw->match)) ha_warning("parsing [%s:%d] : original matching method '%s' was overwritten and will not be applied as expected.\n", file, line, aclkw->kw); }