diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2012-08-27 19:29:38 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2012-08-28 07:57:29 +1000 |
| commit | 8c205395c69fd4cfdde87441589395c782219e1e (patch) | |
| tree | b0e8706423ca36fb43955fe7a48a3a611f9b7394 /source4/scripting/python | |
| parent | f2d9be5af601741444bc5ff3d91edce38acff024 (diff) | |
| download | samba-8c205395c69fd4cfdde87441589395c782219e1e.tar.gz samba-8c205395c69fd4cfdde87441589395c782219e1e.tar.bz2 samba-8c205395c69fd4cfdde87441589395c782219e1e.zip | |
s4-dsdb: Add secrets_tdb_sync - an ldb module to keep secrets.tdb in sync
secrets_tdb_sync is a new ldb module designed to sync secrets.ldb
entries with the secrets.tdb file.
While not ideal to keep two copies of this data, this routine will
assist in allowing the samba-tool domain join code to operate
correctly in most cases where winbindd and smbd are used.
Andrew Bartlett
Diffstat (limited to 'source4/scripting/python')
3 files changed, 4 insertions, 2 deletions
diff --git a/source4/scripting/python/samba/tests/provision.py b/source4/scripting/python/samba/tests/provision.py index cfb6ded3c7..9375f91b83 100644 --- a/source4/scripting/python/samba/tests/provision.py +++ b/source4/scripting/python/samba/tests/provision.py @@ -55,6 +55,7 @@ class ProvisionTestCase(samba.tests.TestCaseInTempDir): def test_setup_secretsdb(self): path = os.path.join(self.tempdir, "secrets.ldb") + secrets_tdb_path = os.path.join(self.tempdir, "secrets.tdb") paths = ProvisionPaths() paths.secrets = path paths.private_dir = os.path.dirname(path) @@ -67,6 +68,7 @@ class ProvisionTestCase(samba.tests.TestCaseInTempDir): finally: del ldb os.unlink(path) + os.unlink(secrets_tdb_path) class FindNssTests(TestCase): diff --git a/source4/scripting/python/samba/tests/upgradeprovision.py b/source4/scripting/python/samba/tests/upgradeprovision.py index ab7378756d..85b7cc7e2b 100644 --- a/source4/scripting/python/samba/tests/upgradeprovision.py +++ b/source4/scripting/python/samba/tests/upgradeprovision.py @@ -126,7 +126,7 @@ class UpdateSecretsTests(samba.tests.TestCaseInTempDir): self.assertEquals(newmodules.msgs, refmodules.msgs) def tearDown(self): - for name in ["ref.ldb", "secrets.ldb"]: + for name in ["ref.ldb", "secrets.ldb", "secrets.tdb"]: path = os.path.join(self.tempdir, name) if os.path.exists(path): os.unlink(path) diff --git a/source4/scripting/python/samba/tests/upgradeprovisionneeddc.py b/source4/scripting/python/samba/tests/upgradeprovisionneeddc.py index 92255ceb25..1de123c71d 100644 --- a/source4/scripting/python/samba/tests/upgradeprovisionneeddc.py +++ b/source4/scripting/python/samba/tests/upgradeprovisionneeddc.py @@ -172,7 +172,7 @@ class UpgradeProvisionWithLdbTestCase(TestCaseInTempDir): self.assertTrue(re.match(".*upgrade to.*", str(oem2))) def tearDown(self): - for name in ["ref.ldb", "secrets.ldb", "sam.ldb"]: + for name in ["ref.ldb", "secrets.ldb", "secrets.tdb", "sam.ldb"]: path = os.path.join(self.tempdir, name) if os.path.exists(path): os.unlink(path) |