s4:samba3.py/upgrade.py: Revert

This reverts commit 2175c0ed0649d545ea833d50e8d33fbee9051c35.
This reverts commit 6c3e2417a0639cd7c367de93615c422cf5217456.
This reverts commit dbb8989e05ac3189a5eca11fa40d572388ea02fc.
This reverts commit 82adfa39b75aa628c88f828278c6ac09335d1a49.
This reverts commit f299efa8f05c6a5b739222bdf75690a4591d3650.

After a small discussion with Jelmer we agreed that this isn't the right way
to fix the problem. We should wait for a real patch rather to rely on temporal
hacks.

1 files changed, 5 insertions, 6 deletions

diff --git a/source4/scripting/python/samba/samba3.py b/source4/scripting/python/samba/samba3.py
index 809fd012a6..987367990d 100644
--- a/source4/scripting/python/samba/samba3.py
+++ b/source4/scripting/python/samba/samba3.py
@@ -509,7 +509,7 @@ class TdbSam(TdbDatabase):
     """Samba 3 TDB passdb backend reader."""
     def _check_version(self):
         self.version = fetch_uint32(self.tdb, "INFO/version\0") or 0
-        assert self.version in (0, 1, 2, 3)
+        assert self.version in (0, 1, 2)
 
     def usernames(self):
         """Iterate over the usernames in this Tdb database."""
@@ -592,11 +592,10 @@ class TdbSam(TdbDatabase):
         for entry in hours:
             for i in range(8):
                 user.hours.append(ord(entry) & (2 ** i) == (2 ** i))
-        # FIXME (reactivate also the tests in tests/samba3.py after fixing this)
-        #(user.bad_password_count, data) = unpack_uint16(data)
-        #(user.logon_count, data) = unpack_uint16(data)
-        #(user.unknown_6, data) = unpack_uint32(data)
-        #assert len(data) == 0
+        (user.bad_password_count, data) = unpack_uint16(data)
+        (user.logon_count, data) = unpack_uint16(data)
+        (user.unknown_6, data) = unpack_uint32(data)
+        assert len(data) == 0
         return user