dns wildcards: fix BUG 13536

The current position in the dns name was not advanced past the '.'
character

Signed-off-by: Gary Lockyer <gary@catalyst.net.nz>
Reviewed-by: Jeremy Allison <jra@samba.org>
Autobuild-User(master): Jeremy Allison <jra@samba.org>
Autobuild-Date(master): Fri Jul 20 04:40:31 CEST 2018 on sn-devel-144

diff --git a/selftest/knownfail.d/dns_wildcard b/selftest/knownfail.d/dns_wildcard
deleted file mode 100644 (file)
index 2c9ade1..0000000
--- 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 2a493702ed2c2f39a96697a6a13c4f920a796ebd..bbbfe920f4eb2b305798d5d9b720e43ed29cad98 100644 (file)
--- a/source4/dns_server/dnsserver_common.c
+++ b/source4/dns_server/dnsserver_common.c
@@ -380,6 +380,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++);
                }