sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-07-15 16:59:09 +03:00
Code Activity

s4:samba3.py/upgrade.py: Revert

Browse Source 
This reverts commit 2175c0ed06.
This reverts commit 6c3e2417a0.
This reverts commit dbb8989e05.
This reverts commit 82adfa39b7.
This reverts commit f299efa8f0.

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.
This commit is contained in:
Matthias Dieter Wallnöfer
2009-11-28 15:28:45 +01:00
parent 8a34cf6f51
commit ecfd1dfcbd
3 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
source4/scripting/python/samba/samba3.py
View File

@ -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

6
source4/scripting/python/samba/tests/samba3.py
View File

@ -122,15 +122,15 @@ class TdbSamTestCase(unittest.TestCase):
user.logoff_time = 2147483647
user.acct_desc = ""
user.group_rid = 1001
# FIXME user.logon_count = 0
# FIXME user.bad_password_count = 0
user.logon_count = 0
user.bad_password_count = 0
user.domain = "BEDWYR"
user.munged_dial = ""
user.workstations = ""
user.user_rid = 1000
user.kickoff_time = 2147483647
user.logoff_time = 2147483647
# FIXME user.unknown_6 = 1260L
user.unknown_6 = 1260L
user.logon_divs = 0
user.hours = [True for i in range(168)]
other = self.samdb["root"]

2
source4/scripting/python/samba/upgrade.py
View File

@ -411,7 +411,7 @@ def upgrade_provision(samba3, setup_dir, message, credentials, session_info,
hostname=netbiosname, machinepass=machinepass,
serverrole=serverrole)
# FIXME: import_wins(Ldb(result.paths.winsdb), samba3.get_wins_db())
import_wins(Ldb(result.paths.winsdb), samba3.get_wins_db())
# FIXME: import_registry(registry.Registry(), samba3.get_registry())