From d5b9972215071d3d09b586fcc371c69002f89192 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Mon, 27 Aug 2012 17:27:16 +1000 Subject: s4-classicupgrade: Read WINS DB before the provision --- source4/scripting/python/samba/upgrade.py | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'source4') diff --git a/source4/scripting/python/samba/upgrade.py b/source4/scripting/python/samba/upgrade.py index 4d4b08a76c..10aa0ec6b7 100644 --- 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) -- cgit