s4:upgrade.py - the import of WINS databases don't seem to work always

[ira/wip.git] / source4 / scripting / python / samba / upgrade.py

diff --git a/source4/scripting/python/samba/upgrade.py b/source4/scripting/python/samba/upgrade.py
index f40f2cffe7f5ac58a655290d0cb3e6729c3fd1f5..89cf767dae31ee2afef1979784623147d674dd99 100644 (file)
--- a/source4/scripting/python/samba/upgrade.py
+++ b/source4/scripting/python/samba/upgrade.py
@@ -7,17 +7,18 @@
 
 """Support code for upgrading from Samba 3 to Samba 4."""
 
-from provision import findnss, provision, FILL_DRS
+__docformat__ = "restructuredText"
+
+from provision import provision, FILL_DRS
 import grp
 import ldb
 import time
 import pwd
-import uuid
 import registry
 from samba import Ldb
-from samba.samdb import SamDB
+from samba.param import LoadParm
 
-def import_sam_policy(samldb, samba3_policy, domaindn):
+def import_sam_policy(samldb, policy, dn):
     """Import a Samba 3 policy database."""
     samldb.modify_ldif("""
 dn: %s
@@ -250,7 +251,7 @@ def upgrade_provision(samba3, setup_dir, message, credentials, session_info, smb
                        domain=domainname, domainsid=domainsid, domainguid=domainguid, 
                        machinepass=machinepass, serverrole=serverrole, targetdir=targetdir)
 
-    import_wins(Ldb(result.paths.winsdb), samba3.get_wins_db())
+    # FIXME: import_wins(Ldb(result.paths.winsdb), samba3.get_wins_db())
 
     # FIXME: import_registry(registry.Registry(), samba3.get_registry())
 
@@ -392,7 +393,7 @@ def upgrade_smbconf(oldconf,mark):
         kept in the new configuration as "samba3:<name>"
     """
     data = oldconf.data()
-    newconf = param_init()
+    newconf = LoadParm()
 
     for s in data:
         for p in data[s]: