From 1e935d1bdc095187b68cd93ff8a1ee9498f8ad11 Mon Sep 17 00:00:00 2001
From: Amitay Isaacs <amitay@gmail.com>
Date: Fri, 25 Nov 2011 15:43:53 +1100
Subject: s4-provision: Make BIND9_DLZ as the default backend for DNS

---
 source4/scripting/python/samba/join.py           | 2 +-
 source4/scripting/python/samba/upgrade.py        | 2 +-
 source4/scripting/python/samba/upgradehelpers.py | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'source4/scripting/python')

diff --git a/source4/scripting/python/samba/join.py b/source4/scripting/python/samba/join.py
index 3ae1a2c81d..3f1abe22eb 100644
--- 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 bf912018eb..3a428604cb 100644
--- 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 3d1aa7a23a..2c7191e707 100755
--- 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,
-- 
cgit