From ecfd1dfcbd8f301b879942322f7fe765f03599bb Mon Sep 17 00:00:00 2001 From: Matthias Dieter Wallnöfer Date: Sat, 28 Nov 2009 15:28:45 +0100 Subject: 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. --- source4/scripting/python/samba/upgrade.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source4/scripting/python/samba/upgrade.py') diff --git a/source4/scripting/python/samba/upgrade.py b/source4/scripting/python/samba/upgrade.py index 3c45245113..205b43cf07 100644 --- a/source4/scripting/python/samba/upgrade.py +++ b/source4/scripting/python/samba/upgrade.py @@ -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()) -- cgit