summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAaron Haslett <aaronhaslett@catalyst.net.nz>2019-01-09 16:22:40 +1300
committerKarolin Seeger <kseeger@samba.org>2019-01-14 10:20:19 +0100
commit8dc1d8c431add361fa20853f98746fb137b24d14 (patch)
treeb5f56caea5e2257a1f38296d7bd34cb8fc28a75d
parentcfad63624ceffc2daa63e16411f6d64309ffc76e (diff)
downloadsamba-8dc1d8c431add361fa20853f98746fb137b24d14.tar.gz
dns: changing onelevel search for wildcard to subtree
SCOPE_ONELEVEL is used on wildcard dns searches, but onelevel searches currently have a performance problem related to GUID indexing, so this patch changes the search scope to SCOPE_SUBTREE. In this case, as the onelevel and subtree sets of records are roughly the same, and the query is matching against the DN itself, we don't believe there's any benefit in using SCOPE_ONELEVEL over SCOPE_SUBTREE. The onelevel performance problem will be fixed separately later, but in the meantime this solves the DNS performance problem. BUG: https://bugzilla.samba.org/show_bug.cgi?id=13738 Signed-off-by: Aaron Haslett <aaronhaslett@catalyst.net.nz> Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz> Reviewed-by: Gary Lockyer <gary@catalyst.net.nz> (cherry picked from commit ef379880037c10589ceeab7f985e3245817908a4)
-rw-r--r--source4/dns_server/dnsserver_common.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source4/dns_server/dnsserver_common.c b/source4/dns_server/dnsserver_common.c
index 0dedf689cef..04f8eeab7bf 100644
--- a/source4/dns_server/dnsserver_common.c
+++ b/source4/dns_server/dnsserver_common.c
@@ -481,7 +481,7 @@ static int dns_wildcard_lookup(struct ldb_context *samdb,
samdb,
frame,
parent,
- LDB_SCOPE_ONELEVEL,
+ LDB_SCOPE_SUBTREE,
query,
attrs,
NULL,