diff options
| author | Gary Lockyer <gary@catalyst.net.nz> | 2018-07-18 15:33:26 +1200 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2018-07-28 06:16:16 +0200 |
| commit | 2bc9c4d8d3940a2f529e86b126010355ccd1e9de (patch) | |
| tree | 128fe0789d09e3155342e1a4fa055abf634832c0 | |
| parent | c6d98623215e37d6a28e590413a18f8d9aec9c8b (diff) | |
| download | samba-2bc9c4d8d3940a2f529e86b126010355ccd1e9de.tar.gz | |
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
(cherry picked from commit cef1b31cd1f33074e8ab6de52aa0fb74e9b57a9f)
| -rw-r--r-- | selftest/knownfail.d/dns_wildcard | 5 | ||||
| -rw-r--r-- | source4/dns_server/dnsserver_common.c | 1 |
2 files changed, 1 insertions, 5 deletions
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++); } |