Skip to content

Commit 8c555a4

Browse files
committed
BUG/MINOR: acl: Properly detect overwritten matching method
A bug was introduced by the commit 6ea50ba ("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.
1 parent f8b7299 commit 8c555a4

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

src/acl.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -410,7 +410,7 @@ struct acl_expr *parse_acl_expr(const char **args, char **err, struct arg_list *
410410
if (((aclkw->match_type == PAT_MATCH_BEG || aclkw->match_type == PAT_MATCH_DIR || aclkw->match_type == PAT_MATCH_DOM ||
411411
aclkw->match_type == PAT_MATCH_DOM || aclkw->match_type == PAT_MATCH_END || aclkw->match_type == PAT_MATCH_LEN ||
412412
aclkw->match_type == PAT_MATCH_REG) && expr->pat.match != pat_match_fcts[aclkw->match_type]) ||
413-
(aclkw->match && expr->pat.match != pat_match_fcts[aclkw->match_type]))
413+
(aclkw->match && expr->pat.match != aclkw->match))
414414
ha_warning("parsing [%s:%d] : original matching method '%s' was overwritten and will not be applied as expected.\n",
415415
file, line, aclkw->kw);
416416
}

0 commit comments

Comments
 (0)