From: Gary Lockyer Date: Wed, 18 Jul 2018 03:33:26 +0000 (+1200) Subject: dns wildcards: fix BUG 13536 X-Git-Tag: samba-4.7.10~24 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2bc9c4d8d3940a2f529e86b126010355ccd1e9de;p=thirdparty%2Fsamba.git dns wildcards: fix BUG 13536 The current position in the dns name was not advanced past the '.' character Signed-off-by: Gary Lockyer Reviewed-by: Jeremy Allison Autobuild-User(master): Jeremy Allison Autobuild-Date(master): Fri Jul 20 04:40:31 CEST 2018 on sn-devel-144 (cherry picked from commit cef1b31cd1f33074e8ab6de52aa0fb74e9b57a9f) --- diff --git a/selftest/knownfail.d/dns_wildcard b/selftest/knownfail.d/dns_wildcard deleted file mode 100644 index 2c9ade138fc..00000000000 --- a/selftest/knownfail.d/dns_wildcard +++ /dev/null @@ -1,5 +0,0 @@ -# https://bugzilla.samba.org/show_bug.cgi?id=13536 -# - -^samba.*.TestWildCardQueries.test_one_a_query_match_wildcard_l2_2_labels -^samba.*.TestWildCardQueries.test_one_a_query_match_wildcard_2_labels diff --git a/source4/dns_server/dnsserver_common.c b/source4/dns_server/dnsserver_common.c index 6c7ab802575..0dedf689cef 100644 --- a/source4/dns_server/dnsserver_common.c +++ b/source4/dns_server/dnsserver_common.c @@ -379,6 +379,7 @@ static struct ldb_parse_tree *build_wildcard_query( wildcard_query->u.list.elements[l] = el; /* skip to the start of the next label */ + x++; for (;x < name->length && name->data[x] != '.'; x++); }