s4-provision: Make BIND9_DLZ as the default backend for DNS

diff --git a/source4/scripting/python/samba/join.py b/source4/scripting/python/samba/join.py
index 3ae1a2c81d77511e4557baae06fec6729bf82da3..3f1abe22ebd501e9afee0affaa019b209ec154ac 100644 (file)
--- a/source4/scripting/python/samba/join.py
+++ b/source4/scripting/python/samba/join.py
@@ -619,7 +619,7 @@ class dc_join(object):
                                  targetdir=ctx.targetdir, samdb_fill=FILL_SUBDOMAIN,
                                  machinepass=ctx.acct_pass, serverrole="domain controller",
                                  lp=ctx.lp, hostip=ctx.names.hostip, hostip6=ctx.names.hostip6,
-                                 dns_backend="BIND9_FLATFILE")
+                                 dns_backend="BIND9_DLZ")
         print("Provision OK for domain %s" % ctx.names.dnsdomain)
 
     def join_replicate(ctx):

diff --git a/source4/scripting/python/samba/upgrade.py b/source4/scripting/python/samba/upgrade.py
index bf912018eb31afa08e8dc4f5c2ea1c8c73b54e93..3a428604cb732be6061e141ae25855a100909c8e 100644 (file)
--- a/source4/scripting/python/samba/upgrade.py
+++ b/source4/scripting/python/samba/upgrade.py
@@ -626,7 +626,7 @@ Please fix this account before attempting to upgrade again
         raise ProvisioningError("Please remove duplicate sid entries before upgrade.")
 
     if serverrole == "ROLE_DOMAIN_BDC" or serverrole == "ROLE_DOMAIN_PDC":
-        dns_backend = "BIND9_FLATFILE"
+        dns_backend = "BIND9_DLZ"
     else:
         dns_backend = "NONE"
 

diff --git a/source4/scripting/python/samba/upgradehelpers.py b/source4/scripting/python/samba/upgradehelpers.py
index 3d1aa7a23a7ff33f1e5c1646bde2c88d04ba5f5f..2c7191e707989ec85e8acc1bfbccad1f6f060cc4 100755 (executable)
--- a/source4/scripting/python/samba/upgradehelpers.py
+++ b/source4/scripting/python/samba/upgradehelpers.py
@@ -256,7 +256,7 @@ def newprovision(names, creds, session, smbconf, provdir, logger):
         shutil.rmtree(provdir)
     os.mkdir(provdir)
     logger.info("Provision stored in %s", provdir)
-    dns_backend="BIND9_FLATFILE"
+    dns_backend="BIND9_DLZ"
     provision(logger, session, creds, smbconf=smbconf,
             targetdir=provdir, samdb_fill=FILL_FULL, realm=names.realm,
             domain=names.domain, domainguid=names.domainguid,

diff --git a/source4/setup/provision b/source4/setup/provision
index f4f6b100423a4f7a81a4d380aa40825b45b2f6b7..cea8823d09676c8e64aa1badf8c19152d816c0e6 100755 (executable)
--- a/source4/setup/provision
+++ b/source4/setup/provision
@@ -84,8 +84,8 @@ parser.add_option("--machinepass", type="string", metavar="PASSWORD",
 parser.add_option("--dns-backend", type="choice", metavar="NAMESERVER-BACKEND",
           choices=["SAMBA_INTERNAL", "BIND9_FLATFILE", "BIND9_DLZ", "NONE"],
         help="The DNS server backend. SAMBA_INTERNAL is the builtin name server, " \
-             "BIND9_FLATFILE uses bind9 text database to store zone information (default), " \
-             "BIND9_DLZ uses samba4 AD to store zone information, " \
+             "BIND9_FLATFILE uses bind9 text database to store zone information, " \
+             "BIND9_DLZ uses samba4 AD to store zone information (default), " \
              "NONE skips the DNS setup entirely (not recommended)")
 parser.add_option("--dnspass", type="string", metavar="PASSWORD",
         help="choose dns password (otherwise random)")
@@ -204,7 +204,7 @@ elif opts.function_level == "2008_R2":
     dom_for_fun_level = DS_DOMAIN_FUNCTION_2008_R2
 
 if opts.dns_backend is None:
-    dns_backend = "BIND9_FLATFILE"
+    dns_backend = "BIND9_DLZ"
 else:
     dns_backend = opts.dns_backend