Merge pull request #955 from buevsan/fix-ipset

gthess · web-flow · commit 167772fbca18 · 2023-10-18T15:08:08.000+02:00
fix ipset wrong behavior
diff --git a/ipset/ipset.c b/ipset/ipset.c
@@ -158,10 +158,10 @@ ipset_check_zones_for_rrset(struct module_env *env, struct ipset_env *ie,
 		qs = NULL;
 		plen = strlen(p->str);
 
-		if (dlen >= plen) {
+		if (dlen == plen || (dlen > plen && dname[dlen - plen - 1] == '.' )) {
 			ds = dname + (dlen - plen);
 		}
-		if (qlen >= plen) {
+		if (qlen == plen || (qlen > plen && qname[qlen - plen - 1] == '.' )) {
 			qs = qname + (qlen - plen);
 		}
 		if ((ds && strncasecmp(p->str, ds, plen) == 0)

Original file line number	Diff line number	Diff line change
`@@ -158,10 +158,10 @@ ipset_check_zones_for_rrset(struct module_env env, struct ipset_env ie,`
`158`	`158`	`qs = NULL;`
`159`	`159`	`plen = strlen(p->str);`
`160`	`160`
`161`		`- if (dlen >= plen) {`
	`161`	`+ if (dlen == plen \|\| (dlen > plen && dname[dlen - plen - 1] == '.' )) {`
`162`	`162`	`ds = dname + (dlen - plen);`
`163`	`163`	`}`
`164`		`- if (qlen >= plen) {`
	`164`	`+ if (qlen == plen \|\| (qlen > plen && qname[qlen - plen - 1] == '.' )) {`
`165`	`165`	`qs = qname + (qlen - plen);`
`166`	`166`	`}`
`167`	`167`	`if ((ds && strncasecmp(p->str, ds, plen) == 0)`