python: Remove unused parameter ‘samdb’

Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>

diff --git a/python/samba/tests/upgradeprovisionneeddc.py b/python/samba/tests/upgradeprovisionneeddc.py
index 706b4fa0e884b33a4f30df9d2b776d7b85d99fa1..8cabfa2765e888b2c41301c140f750e34b794b7b 100644 (file)
--- a/python/samba/tests/upgradeprovisionneeddc.py
+++ b/python/samba/tests/upgradeprovisionneeddc.py
@@ -139,7 +139,7 @@ class UpgradeProvisionWithLdbTestCase(TestCaseInTempDir):
                             self.names.policyid)
         shutil.rmtree(dir)
         self.assertFalse(os.path.isdir(dir))
-        update_gpo(self.paths, self.ldbs.sam, self.names)
+        update_gpo(self.paths, self.names)
         self.assertTrue(os.path.isdir(dir))
 
     def test_update_gpo_acl(self):
@@ -150,7 +150,7 @@ class UpgradeProvisionWithLdbTestCase(TestCaseInTempDir):
         os.mkdir(os.path.join(path, self.names.dnsdomain))
         os.mkdir(os.path.join(os.path.join(path, self.names.dnsdomain),
                               "Policies"))
-        update_gpo(self.paths, self.ldbs.sam, self.names)
+        update_gpo(self.paths, self.names)
         shutil.rmtree(path)
         self.paths.sysvol = save
 

diff --git a/python/samba/upgradehelpers.py b/python/samba/upgradehelpers.py
index d19a1b96a631c9d44bc0487d3341f6e102212e87..badfc46018990151fd1c98a3c68e1741daae6e3a 100644 (file)
--- a/python/samba/upgradehelpers.py
+++ b/python/samba/upgradehelpers.py
@@ -451,7 +451,7 @@ def updateOEMInfo(samdb, rootdn):
         samdb.modify(delta)
 
 
-def update_gpo(paths, samdb, names):
+def update_gpo(paths, names):
     """Create missing GPO file object if needed
     """
     dir = getpolicypath(paths.sysvol, names.dnsdomain, names.policyid)

diff --git a/source4/scripting/bin/samba_upgradeprovision b/source4/scripting/bin/samba_upgradeprovision
index ed3abad4d5721df899f1b397d33b03e17e7ece01..18aae6d1423579331abf5b6907e963175851924b 100755 (executable)
--- a/source4/scripting/bin/samba_upgradeprovision
+++ b/source4/scripting/bin/samba_upgradeprovision
@@ -1819,7 +1819,7 @@ if __name__ == '__main__':
 
         if opts.full:
             try:
-                update_gpo(paths, ldbs.sam, names)
+                update_gpo(paths, names)
             except ProvisioningError as e:
                 message(ERROR, "The policy for domain controller is missing. "
                             "You should restart upgradeprovision with --full")