summaryrefslogtreecommitdiffstats
path: root/source4/scripting/python/samba/upgrade.py
diff options
context:
space:
mode:
authorKai Blin <kai@samba.org>2011-10-15 13:54:45 +0200
committerKai Blin <kai@samba.org>2011-10-17 09:51:12 +0200
commit8c076862ad0b1b14bb6addef323c5678368051af (patch)
tree279f533395f179f903c49ae3e92739c184f986d5 /source4/scripting/python/samba/upgrade.py
parentd58f266d19750484b72ad0e18de3e83c88e81169 (diff)
downloadsamba-8c076862ad0b1b14bb6addef323c5678368051af.tar.gz
samba-8c076862ad0b1b14bb6addef323c5678368051af.tar.xz
samba-8c076862ad0b1b14bb6addef323c5678368051af.zip
s4 provision: DNS backend should be set by caller
Autobuild-User: Kai Blin <kai@samba.org> Autobuild-Date: Mon Oct 17 09:51:12 CEST 2011 on sn-devel-104
Diffstat (limited to 'source4/scripting/python/samba/upgrade.py')
-rw-r--r--source4/scripting/python/samba/upgrade.py8
1 files changed, 7 insertions, 1 deletions
diff --git a/source4/scripting/python/samba/upgrade.py b/source4/scripting/python/samba/upgrade.py
index b41ab77eb2..07cb720f88 100644
--- a/source4/scripting/python/samba/upgrade.py
+++ b/source4/scripting/python/samba/upgrade.py
@@ -621,14 +621,20 @@ Please fix this account before attempting to upgrade again
logger.error(" %s" % str(sid))
raise ProvisioningError("Please remove duplicate sid entries before upgrade.")
+ if serverrole == "domain controller":
+ dns_backend = "BIND9_FLATFILE"
+ else:
+ dns_backend = "NONE"
+
# Do full provision
result = provision(logger, session_info, None,
targetdir=targetdir, realm=realm, domain=domainname,
domainsid=str(domainsid), next_rid=next_rid,
dc_rid=machinerid,
+ dom_for_fun_level=dsdb.DS_DOMAIN_FUNCTION_2003,
hostname=netbiosname, machinepass=machinepass,
serverrole=serverrole, samdb_fill=FILL_FULL,
- useeadb=useeadb)
+ useeadb=useeadb, dns_backend=dns_backend)
# Import WINS database
logger.info("Importing WINS database")