selftest: correcting empty attribute usage in requests

Many parts of Samba use an empty attribute list in requests expecting
all attributes to be returned in the response, which is incorrect.  This
patch corrects the instances found by current CI tests.  Static analysis
and debugging will need to be done before changing ildap to the correct
semantics.

Signed-off-by: Aaron Haslett <aaronhaslett@catalyst.net.nz>
Reviewed-by: Garming Sam <garming@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Autobuild-User(master): Garming Sam <garming@samba.org>
Autobuild-Date(master): Mon May  6 05:45:55 UTC 2019 on sn-devel-184

diff --git a/python/samba/tests/samba_tool/computer.py b/python/samba/tests/samba_tool/computer.py
index 38ea5f774c4f39a27f649dadecce6a811e3b36da..6b06d4f32f6ea458c9f3f3843b116f2a8948e1ce 100644 (file)
--- a/python/samba/tests/samba_tool/computer.py
+++ b/python/samba/tests/samba_tool/computer.py
@@ -282,7 +282,7 @@ class ComputerCmdTestCase(SambaToolCmdTest):
                           self.samdb.domain_dn()))
         computerlist = self.samdb.search(base=self.samdb.domain_dn(),
                                          scope=ldb.SCOPE_SUBTREE,
-                                         expression=search_filter, attrs=[])
+                                         expression=search_filter)
         if computerlist:
             return computerlist[0]
         else:

diff --git a/python/samba/tests/samba_tool/group.py b/python/samba/tests/samba_tool/group.py
index 9862251ff01ef39d4c93ce25b4c12f366fba01d1..e521c720b77216bc2befd2f45a55a994323493af 100644 (file)
--- a/python/samba/tests/samba_tool/group.py
+++ b/python/samba/tests/samba_tool/group.py
@@ -243,8 +243,7 @@ class GroupCmdTestCase(SambaToolCmdTest):
                           self.samdb.domain_dn()))
         grouplist = self.samdb.search(base=self.samdb.domain_dn(),
                                       scope=ldb.SCOPE_SUBTREE,
-                                      expression=search_filter,
-                                      attrs=[])
+                                      expression=search_filter)
         if grouplist:
             return grouplist[0]
         else:

diff --git a/python/samba/tests/samba_tool/ou.py b/python/samba/tests/samba_tool/ou.py
index d318fd3ff8536058dc9a3933a0f2922792be117f..39b0cad425037521b1b670525c9f6c08f6a0cae1 100644 (file)
--- a/python/samba/tests/samba_tool/ou.py
+++ b/python/samba/tests/samba_tool/ou.py
@@ -264,8 +264,7 @@ class OUCmdTestCase(SambaToolCmdTest):
                           self.samdb.domain_dn()))
         oulist = self.samdb.search(base=self.samdb.domain_dn(),
                                    scope=ldb.SCOPE_SUBTREE,
-                                   expression=search_filter,
-                                   attrs=[])
+                                   expression=search_filter)
         if oulist:
             return oulist[0]
         else:

diff --git a/python/samba/tests/samba_tool/user.py b/python/samba/tests/samba_tool/user.py
index 1816b895de48c60529c2a6402fe9074a29ddc8a1..7ae80876b2aae77fdd8fa4d3e33a5a389eacd617 100644 (file)
--- a/python/samba/tests/samba_tool/user.py
+++ b/python/samba/tests/samba_tool/user.py
@@ -592,7 +592,7 @@ sAMAccountName: %s
         search_filter = "(&(sAMAccountName=%s)(objectCategory=%s,%s))" % (ldb.binary_encode(name), "CN=Person,CN=Schema,CN=Configuration", self.samdb.domain_dn())
         userlist = self.samdb.search(base=self.samdb.domain_dn(),
                                      scope=ldb.SCOPE_SUBTREE,
-                                     expression=search_filter, attrs=[])
+                                     expression=search_filter)
         if userlist:
             return userlist[0]
         else:

diff --git a/source4/dsdb/tests/python/sec_descriptor.py b/source4/dsdb/tests/python/sec_descriptor.py
index 5e0f1453423c064e074700ecb75c1181c2d88648..a495356ac48a77935692e2f1cf049a74fa2e7f48 100755 (executable)
--- a/source4/dsdb/tests/python/sec_descriptor.py
+++ b/source4/dsdb/tests/python/sec_descriptor.py
@@ -1847,7 +1847,7 @@ class SdFlagsDescriptorTests(DescriptorTests):
         self.assertFalse("nTSecurityDescriptor" in res[0])
 
         res = self.ldb_admin.search(self.base_dn, SCOPE_BASE, None,
-                                    [], controls=["sd_flags:1:%d" % (sd_flags)])
+                                    controls=["sd_flags:1:%d" % (sd_flags)])
         self.assertTrue("nTSecurityDescriptor" in res[0])
         tmp = res[0]["nTSecurityDescriptor"][0]
         sd = ndr_unpack(security.descriptor, tmp)