dns wildcards: fix BUG 13536
authorGary Lockyer <gary@catalyst.net.nz>
Wed, 18 Jul 2018 03:33:26 +0000 (15:33 +1200)
committerKarolin Seeger <kseeger@samba.org>
Mon, 13 Aug 2018 10:56:36 +0000 (12:56 +0200)
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

(cherry picked from commit cef1b31cd1f33074e8ab6de52aa0fb74e9b57a9f)

selftest/knownfail.d/dns_wildcard [deleted file]
source4/dns_server/dnsserver_common.c

diff --git a/selftest/knownfail.d/dns_wildcard b/selftest/knownfail.d/dns_wildcard
deleted file mode 100644 (file)
index 2c9ade1..0000000
+++ /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
index 6c7ab8025754e10d84ad4078824ffecb42a06702..0dedf689cef1dda0ac1d40f13dac77199c40fd69 100644 (file)
@@ -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++);
                }