diff options
| author | Amitay Isaacs <amitay@gmail.com> | 2011-11-25 15:43:53 +1100 |
|---|---|---|
| committer | Amitay Isaacs <amitay@gmail.com> | 2011-11-29 16:00:36 +1100 |
| commit | 1e935d1bdc095187b68cd93ff8a1ee9498f8ad11 (patch) | |
| tree | c4574d50bfc68a0539d695fee84966cbff962021 | |
| parent | 7ac5c5061eafa3f6b3c85ab68eefc007564cadcb (diff) | |
| download | samba-1e935d1bdc095187b68cd93ff8a1ee9498f8ad11.tar.gz samba-1e935d1bdc095187b68cd93ff8a1ee9498f8ad11.tar.bz2 samba-1e935d1bdc095187b68cd93ff8a1ee9498f8ad11.zip | |
s4-provision: Make BIND9_DLZ as the default backend for DNS
| -rw-r--r-- | source4/scripting/python/samba/join.py | 2 | ||||
| -rw-r--r-- | source4/scripting/python/samba/upgrade.py | 2 | ||||
| -rwxr-xr-x | source4/scripting/python/samba/upgradehelpers.py | 2 | ||||
| -rwxr-xr-x | source4/setup/provision | 6 |
4 files changed, 6 insertions, 6 deletions
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, diff --git a/source4/setup/provision b/source4/setup/provision index f4f6b10042..cea8823d09 100755 --- 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 |