s4-classicupgrade: Read WINS DB before the provision

diff --git a/source4/scripting/python/samba/upgrade.py b/source4/scripting/python/samba/upgrade.py
index 4d4b08a76c9a2662ca6084c572088836398711ca..10aa0ec6b75071fd0b2919f8c7673733fd42b061 100644 (file)
--- a/source4/scripting/python/samba/upgrade.py
+++ b/source4/scripting/python/samba/upgrade.py
@@ -809,6 +809,13 @@ Please fix this account before attempting to upgrade again
                 except KeyError:
                     pass
 
+    logger.info("Reading WINS database")
+    samba3_winsdb = None
+    try:
+        samba3_winsdb = samba3.get_wins_db()
+    except IOError, e:
+        logger.warn('Cannot open wins database, Ignoring: %s', str(e))
+
     if not (serverrole == "ROLE_DOMAIN_BDC" or serverrole == "ROLE_DOMAIN_PDC"):
         dns_backend = "NONE"
 
@@ -827,12 +834,6 @@ Please fix this account before attempting to upgrade again
     # Import WINS database
     logger.info("Importing WINS database")
 
-    samba3_winsdb = None
-    try:
-        samba3_winsdb = samba3.get_wins_db()
-    except IOError, e:
-        logger.warn('Cannot open wins database, Ignoring: %s', str(e))
-
     if samba3_winsdb:
         import_wins(Ldb(result.paths.winsdb), samba3_winsdb)