diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2012-08-27 17:27:16 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2012-08-28 07:57:29 +1000 |
| commit | d5b9972215071d3d09b586fcc371c69002f89192 (patch) | |
| tree | 939d2f9538f62aff891a56be8a98e5812a77a87a /source4 | |
| parent | 85f1c4fdfdda7e9c765c6c4ab7f50519c657a409 (diff) | |
| download | samba-d5b9972215071d3d09b586fcc371c69002f89192.tar.gz samba-d5b9972215071d3d09b586fcc371c69002f89192.tar.bz2 samba-d5b9972215071d3d09b586fcc371c69002f89192.zip | |
s4-classicupgrade: Read WINS DB before the provision
Diffstat (limited to 'source4')
| -rw-r--r-- | source4/scripting/python/samba/upgrade.py | 13 |
1 files changed, 7 insertions, 6 deletions
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) |