From: Thierry FOURNIER Date: Fri, 6 Feb 2015 16:53:54 +0000 (+0100) Subject: BUG/MEDIUM: pattern: some entries are not deleted with case insensitive match X-Git-Tag: v1.6-dev1~142 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=73bc285be194f443dc7eab9c949e87e1dbe8f70c;p=thirdparty%2Fhaproxy.git BUG/MEDIUM: pattern: some entries are not deleted with case insensitive match ACL or map entries are not deleted with the command "del acl" or "del map" if the case insentive flag is set. This is because the the case insensitive string are stored in a list and the default delete function associated with string looks in a tree. I add a check of the case insensitive flag and execute the delete function for lists if it is set. This patch must be backported in 1.5 version. --- diff --git a/src/pattern.c b/src/pattern.c index a6fc52d612..b19ffe2736 100644 --- a/src/pattern.c +++ b/src/pattern.c @@ -1308,6 +1308,10 @@ void pat_del_tree_str(struct pattern_expr *expr, struct pat_ref_elt *ref) struct ebmb_node *node, *next_node; struct pattern_tree *elt; + /* If the flag PAT_F_IGNORE_CASE is set, we cannot use trees */ + if (expr->mflags & PAT_MF_IGNORE_CASE) + return pat_del_list_ptr(expr, ref); + /* browse each node of the tree. */ for (node = ebmb_first(&expr->pattern_tree), next_node = node ? ebmb_next(node) : NULL; node;