diff options
| author | Rusty Russell <rusty@rustcorp.com.au> | 2013-04-11 17:12:09 +0930 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2013-04-12 14:59:16 -0700 |
| commit | 1cf46d2e35c3c290a3d7d1c57d622a2abf2643e6 (patch) | |
| tree | 8e40af250881bafaf0deddadab5676d11c391078 /python/samba/tests | |
| parent | 5b15d107951d353eb4f055a62cf48a8226e8e6a6 (diff) | |
| download | samba-1cf46d2e35c3c290a3d7d1c57d622a2abf2643e6.tar.gz samba-1cf46d2e35c3c290a3d7d1c57d622a2abf2643e6.tar.bz2 samba-1cf46d2e35c3c290a3d7d1c57d622a2abf2643e6.zip | |
source4/scripting/python/samba/samba3: handle ntdb files.
Upgrading old Samba 3 instances seems like a place where we don't have
to read ntdb files, but Andrew Bartlett points out that you can run a
Samba 4.0 and even a 4.1 'classic' domain and desire to migrate that
to the AD DC.
So make this upgrade code generic: if it finds an ntdb file, read
that, otherwise read the tdb file.
Cc: Jelmer Vernooij <jelmer@samba.org>
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Reviewed-by: Jeremy Allison <jra@samba.org>
Diffstat (limited to 'python/samba/tests')
| -rw-r--r-- | python/samba/tests/samba3.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/python/samba/tests/samba3.py b/python/samba/tests/samba3.py index 0a7f13c66f..51d76dd94c 100644 --- a/python/samba/tests/samba3.py +++ b/python/samba/tests/samba3.py @@ -39,7 +39,7 @@ class RegistryTestCase(TestCase): def setUp(self): super(RegistryTestCase, self).setUp() - self.registry = Registry(os.path.join(DATADIR, "registry.tdb")) + self.registry = Registry(os.path.join(DATADIR, "registry")) def tearDown(self): self.registry.close() @@ -194,7 +194,7 @@ class IdmapDbTestCase(TestCase): def setUp(self): super(IdmapDbTestCase, self).setUp() self.idmapdb = IdmapDatabase(os.path.join(DATADIR, - "winbindd_idmap.tdb")) + "winbindd_idmap")) def test_user_hwm(self): self.assertEquals(10000, self.idmapdb.get_user_hwm()) |