sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-27 22:50:26 +03:00
Code

s4-s3-upgrade Fix samba3upgrade code to cope with a missing wins.dat

Browse Source
This commit is contained in:
Andrew Bartlett 2011-10-19 09:31:16 +11:00
parent 75689effdf
commit 596d6cceab
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -243,6 +243,7 @@ def import_wins(samba4_winsdb, samba3_winsdb):
:param samba4_winsdb: WINS database to import to
:param samba3_winsdb: WINS database to import from
"""
version_id = 0
for (name, (ttl, ips, nb_flags)) in samba3_winsdb.items():
@ -641,7 +642,15 @@ Please fix this account before attempting to upgrade again
# Import WINS database
logger.info("Importing WINS database")
import_wins(Ldb(result.paths.winsdb), samba3.get_wins_db())
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)
# Set Account policy
logger.info("Importing Account policy")