From eb727331a3702d025036daab619f428eb749c5f3 Mon Sep 17 00:00:00 2001 From: Joseph Sutton Date: Thu, 23 Nov 2023 20:50:42 +1300 Subject: [PATCH] =?utf8?q?python:=20Remove=20unused=20parameter=20?= =?utf8?q?=E2=80=98samdb=E2=80=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Joseph Sutton Reviewed-by: Andrew Bartlett --- python/samba/tests/upgradeprovisionneeddc.py | 4 ++-- python/samba/upgradehelpers.py | 2 +- source4/scripting/bin/samba_upgradeprovision | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/python/samba/tests/upgradeprovisionneeddc.py b/python/samba/tests/upgradeprovisionneeddc.py index 706b4fa0e88..8cabfa2765e 100644 --- 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 d19a1b96a63..badfc460189 100644 --- 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 ed3abad4d57..18aae6d1423 100755 --- 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") -- 2.47.2