[SCM] Samba Shared Repository - branch master updated

[Douglas Bagnall]

The branch, master has been updated
       via  8af4ec752a5 selftest: Improve an error message
       via  ef379880037 dns: changing onelevel search for wildcard to subtree
      from  93c54a4b3c4 statvfs: rename linux_statvfs to posix_statvfs

https://git.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 8af4ec752a55b376c81a4946bb44081a933bee91
Author: Volker Lendecke <vl at samba.org>
Date:   Fri Dec 7 15:14:46 2018 +0100

    selftest: Improve an error message
    
    Signed-off-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
    
    Autobuild-User(master): Douglas Bagnall <dbagnall at samba.org>
    Autobuild-Date(master): Fri Jan 11 06:01:01 CET 2019 on sn-devel-144

commit ef379880037c10589ceeab7f985e3245817908a4
Author: Aaron Haslett <aaronhaslett at catalyst.net.nz>
Date:   Wed Jan 9 16:22:40 2019 +1300

    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 at catalyst.net.nz>
    Reviewed-by: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
    Reviewed-by: Gary Lockyer <gary at catalyst.net.nz>

-----------------------------------------------------------------------

Summary of changes:
 python/samba/tests/getdcname.py       | 3 ++-
 source4/dns_server/dnsserver_common.c | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/python/samba/tests/getdcname.py b/python/samba/tests/getdcname.py
index de3fd3df5e0..5b777478bf7 100644
--- a/python/samba/tests/getdcname.py
+++ b/python/samba/tests/getdcname.py
@@ -275,7 +275,8 @@ class GetDCNameEx(samba.tests.TestCase):
                                                     flags=netlogon.DS_RETURN_DNS_NAME,
                                                     ex2=False)
         except WERRORError as e:
-            self.fail("Failed to succeed over winbind: " + str(e))
+            self.fail("get_dc_name (domain=%s,site=%s) over winbind failed: %s"
+                      % (self.trust_domain, site, e))
 
         self.assertTrue(response_trust is not None)
         self.assertEqual(response_trust.domain_name.lower(),
diff --git a/source4/dns_server/dnsserver_common.c b/source4/dns_server/dnsserver_common.c
index 656d7ca6bff..e0849713604 100644
--- a/source4/dns_server/dnsserver_common.c
+++ b/source4/dns_server/dnsserver_common.c
@@ -482,7 +482,7 @@ static int dns_wildcard_lookup(struct ldb_context *samdb,
 				      samdb,
 				      frame,
 				      parent,
-				      LDB_SCOPE_ONELEVEL,
+				      LDB_SCOPE_SUBTREE,
 				      query,
 				      attrs,
 				      NULL,


-- 
Samba Shared Repository