sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-07-27 07:42:04 +03:00
Code Activity

s4-classicupgrade: Read WINS DB before the provision

Browse Source
This commit is contained in:
Andrew Bartlett
2012-08-27 17:27:16 +10:00
parent 85f1c4fdfd
commit d5b9972215
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
source4/scripting/python/samba/upgrade.py
View File

@ -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)