r26585: Fix samba3.python tests.

(This used to be commit 231ec0777b7d1fb1297e3a974871b8735a386cfa)

2 files changed, 30 insertions, 22 deletions

diff --git a/source4/scripting/python/samba/samba3.py b/source4/scripting/python/samba/samba3.py
index d8289ae756..8225eacd58 100644
--- a/source4/scripting/python/samba/samba3.py
+++ b/source4/scripting/python/samba/samba3.py
@@ -22,12 +22,16 @@
 REGISTRY_VALUE_PREFIX = "SAMBA_REGVAL"
 REGISTRY_DB_VERSION = 1
 
+import os
 import tdb
 
 class Registry:
     """Simple read-only support for reading the Samba3 registry."""
     def __init__(self, file):
-        self.tdb = tdb.Tdb(file)
+        self.tdb = tdb.Tdb(file, flags=os.O_RDONLY)
+
+    def close(self):
+        self.tdb.close()
 
     def __len__(self):
         """Return the number of keys."""
@@ -38,7 +42,7 @@ class Registry:
         return [k.rstrip("\x00") for k in self.tdb.keys() if not k.startswith(REGISTRY_VALUE_PREFIX)]
 
     def subkeys(self, key):
-        data = self.tdb.get(key)
+        data = self.tdb.get("%s\x00" % key)
         if data is None:
             return []
         # FIXME: Parse data
@@ -46,7 +50,7 @@ class Registry:
 
     def values(self, key):
         """Return a dictionary with the values set for a specific key."""
-        data = self.tdb.get("%s/%s" % (REGISTRY_VALUE_PREFIX, key))
+        data = self.tdb.get("%s/%s\x00" % (REGISTRY_VALUE_PREFIX, key))
         if data is None:
             return {}
         # FIXME: Parse data
@@ -55,17 +59,17 @@ class Registry:
 
 class PolicyDatabase:
     def __init__(self, file):
-        self.tdb = tdb.Tdb(file)
-        self.min_password_length = tdb.fetch_uint32("min password length")
-        self.user_must_logon_to_change_password = tdb.fetch_uint32("password history")
-        self.user_must_logon_to_change_password = tdb.fetch_uint32("user must logon to change pasword")
-        self.maximum_password_age = tdb.fetch_uint32("maximum password age")
-        self.minimum_password_age = tdb.fetch_uint32("minimum password age")
-        self.lockout_duration = tdb.fetch_uint32("lockout duration")
-        self.reset_count_minutes = tdb.fetch_uint32("reset count minutes")
-        self.bad_lockout_minutes = tdb.fetch_uint32("bad lockout minutes")
-        self.disconnect_time = tdb.fetch_uint32("disconnect time")
-        self.refuse_machine_password_change = tdb.fetch_uint32("refuse machine password change")
+        self.tdb = tdb.Tdb(file, flags=os.O_RDONLY)
+        self.min_password_length = self.tdb.fetch_uint32("min password length\x00")
+        self.password_history = self.tdb.fetch_uint32("password history\x00")
+        self.user_must_logon_to_change_password = self.tdb.fetch_uint32("user must logon to change pasword\x00")
+        self.maximum_password_age = self.tdb.fetch_uint32("maximum password age\x00")
+        self.minimum_password_age = self.tdb.fetch_uint32("minimum password age\x00")
+        self.lockout_duration = self.tdb.fetch_uint32("lockout duration\x00")
+        self.reset_count_minutes = self.tdb.fetch_uint32("reset count minutes\x00")
+        self.bad_lockout_minutes = self.tdb.fetch_uint32("bad lockout minutes\x00")
+        self.disconnect_time = self.tdb.fetch_int32("disconnect time\x00")
+        self.refuse_machine_password_change = self.tdb.fetch_uint32("refuse machine password change\x00")
 
         # FIXME: Read privileges as well
 
@@ -83,7 +87,7 @@ MEMBEROF_PREFIX = "MEMBEROF/"
 
 class GroupMappingDatabase:
     def __init__(self, file): 
-        self.tdb = tdb.Tdb(file)
+        self.tdb = tdb.Tdb(file, flags=os.O_RDONLY)
 
 
 # High water mark keys
@@ -95,13 +99,13 @@ IDMAP_VERSION = 2
 
 class IdmapDatabase:
     def __init__(self, file):
-        self.tdb = tdb.Tdb(file)
+        self.tdb = tdb.Tdb(file, flags=os.O_RDONLY)
         assert self.tdb.fetch_int32("IDMAP_VERSION") == IDMAP_VERSION
 
 
 class SecretsDatabase:
     def __init__(self, file):
-        self.tdb = tdb.Tdb(file)
+        self.tdb = tdb.Tdb(file, flags=os.O_RDONLY)
         self.domains = {}
         for k, v in self.tdb.items():
             if k == "SECRETS/AUTH_PASSWORD":
@@ -138,7 +142,7 @@ SHARE_DATABASE_VERSION_V2 = 2
 
 class ShareInfoDatabase:
     def __init__(self, file):
-        self.tdb = tdb.Tdb(file)
+        self.tdb = tdb.Tdb(file, flags=os.O_RDONLY)
         assert self.tdb.fetch_int32("INFO/version") in (SHARE_DATABASE_VERSION_V1, SHARE_DATABASE_VERSION_V2)
 
     def get_secdesc(self, name):
@@ -189,7 +193,7 @@ class Smbpasswd:
 
 class TdbSam:
     def __init__(self, file):
-        self.tdb = tdb.Tdb(file)
+        self.tdb = tdb.Tdb(file, flags=os.O_RDONLY)
 
 
 class WinsDatabase:
diff --git a/source4/scripting/python/samba/tests/samba3.py b/source4/scripting/python/samba/tests/samba3.py
index c6b6281c60..0d56ca9117 100644
--- a/source4/scripting/python/samba/tests/samba3.py
+++ b/source4/scripting/python/samba/tests/samba3.py
@@ -22,16 +22,20 @@ from samba.samba3 import GroupMappingDatabase, Registry, PolicyDatabase
 import os
 
 DATADIR=os.path.join(os.path.dirname(__file__), "../../../../../testdata/samba3")
+print "Samba 3 data dir: %s" % DATADIR
 
 class RegistryTestCase(unittest.TestCase):
     def setUp(self):
         self.registry = Registry(os.path.join(DATADIR, "registry.tdb"))
 
+    def tearDown(self):
+        self.registry.close()
+
     def test_length(self):
         self.assertEquals(28, len(self.registry))
 
     def test_keys(self):
-        self.assertEquals([], self.registry.keys())
+        self.assertTrue("HKLM" in self.registry.keys())
 
 
 class PolicyTestCase(unittest.TestCase):
@@ -45,10 +49,10 @@ class PolicyTestCase(unittest.TestCase):
         self.assertEquals(self.policy.refuse_machine_password_change, 0)
         self.assertEquals(self.policy.reset_count_minutes, 0)
         self.assertEquals(self.policy.disconnect_time, -1)
-        self.assertEquals(self.policy.user_must_logon_to_change_password, 0)
+        self.assertEquals(self.policy.user_must_logon_to_change_password, None)
         self.assertEquals(self.policy.password_history, 0)
         self.assertEquals(self.policy.lockout_duration, 0)
-        self.assertEquals(self.policy.bad_lockout_minutes, 0)
+        self.assertEquals(self.policy.bad_lockout_minutes, None)
 
 
 class GroupsTestCase(unittest.TestCase):