summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKai Blin <kai@samba.org>2011-10-15 12:17:14 +0200
committerKai Blin <kai@samba.org>2011-10-17 08:16:12 +0200
commit292554c396d0a848bb73423e08a5f30eba1d4907 (patch)
tree593f6574f2fe2772e2c4f21df331cf06a6e9585b
parent009b97d6f36eae2b4e8ac1452cb5ebb57dec1b46 (diff)
downloadsamba-292554c396d0a848bb73423e08a5f30eba1d4907.tar.gz
samba-292554c396d0a848bb73423e08a5f30eba1d4907.tar.bz2
samba-292554c396d0a848bb73423e08a5f30eba1d4907.zip
s4 provision: Rename bind9 flatfile backend to BIND9_FLATFILE
-rw-r--r--source4/scripting/python/samba/provision/__init__.py8
-rw-r--r--source4/scripting/python/samba/provision/sambadns.py4
-rwxr-xr-xsource4/setup/provision4
3 files changed, 8 insertions, 8 deletions
diff --git a/source4/scripting/python/samba/provision/__init__.py b/source4/scripting/python/samba/provision/__init__.py
index a3633ab128..6594e39cb3 100644
--- a/source4/scripting/python/samba/provision/__init__.py
+++ b/source4/scripting/python/samba/provision/__init__.py
@@ -1625,9 +1625,9 @@ def provision_fill(samdb, secrets_ldb, logger, names, paths,
dnsdomain=names.dnsdomain,
dns_keytab_path=paths.dns_keytab, dnspass=dnspass)
- # Default DNS backend is BIND9 using txt files for zone information
+ # Default DNS backend is BIND9_FLATFILE using txt files for zone information
if not dns_backend:
- dns_backend = "BIND9"
+ dns_backend = "BIND9_FLATFILE"
setup_ad_dns(samdb, names, logger, hostip=hostip, hostip6=hostip6,
dns_backend=dns_backend, os_level=dom_for_fun_level)
@@ -1640,7 +1640,7 @@ def provision_fill(samdb, secrets_ldb, logger, names, paths,
# Only make a zone file on the first DC, it should be
# replicated with DNS replication
- if dns_backend == "BIND9":
+ if dns_backend == "BIND9_FLATFILE":
create_zone_file(lp, logger, paths, targetdir,
dnsdomain=names.dnsdomain, hostip=hostip, hostip6=hostip6,
hostname=names.hostname, realm=names.realm,
@@ -2127,7 +2127,7 @@ def create_named_conf(paths, realm, dnsdomain, dns_backend):
:param keytab_name: File name of DNS keytab file
"""
- if dns_backend == "BIND9":
+ if dns_backend == "BIND9_FLATFILE":
setup_file(setup_path("named.conf"), paths.namedconf, {
"DNSDOMAIN": dnsdomain,
"REALM": realm,
diff --git a/source4/scripting/python/samba/provision/sambadns.py b/source4/scripting/python/samba/provision/sambadns.py
index 37da5964aa..b83be18a72 100644
--- a/source4/scripting/python/samba/provision/sambadns.py
+++ b/source4/scripting/python/samba/provision/sambadns.py
@@ -459,10 +459,10 @@ def setup_ad_dns(samdb, names, logger, hostip=None, hostip6=None, dns_backend=No
"""
if dns_backend is None:
- dns_backend = "BIND9"
+ dns_backend = "BIND9_FLATFILE"
logger.info("Assuming bind9 DNS server backend")
- # If dns_backend is BIND9
+ # If dns_backend is BIND9_FLATFILE
# Populate only CN=MicrosoftDNS,CN=System,<DOMAINDN>
#
# If dns_backend is SAMBA or BIND9_DLZ
diff --git a/source4/setup/provision b/source4/setup/provision
index 9ddbccf83a..a1c403fc19 100755
--- a/source4/setup/provision
+++ b/source4/setup/provision
@@ -82,8 +82,8 @@ parser.add_option("--krbtgtpass", type="string", metavar="PASSWORD",
parser.add_option("--machinepass", type="string", metavar="PASSWORD",
help="choose machine password (otherwise random)")
parser.add_option("--dns-backend", type="choice", metavar="NAMESERVER-BACKEND",
- choices=["SAMBA", "BIND9", "BIND9_DLZ"],
- help="The DNS server backend. SAMBA is the builtin name server (experimental), BIND9 uses bind9 text database to store zone information (default), BIND9_DLZ uses samba4 AD to store zone information (recommended)")
+ choices=["SAMBA", "BIND9_FLATFILE", "BIND9_DLZ"],
+ help="The DNS server backend. SAMBA is the builtin name server (experimental), BIND9_FLATFILE uses bind9 text database to store zone information (default), BIND9_DLZ uses samba4 AD to store zone information (recommended)")
parser.add_option("--dnspass", type="string", metavar="PASSWORD",
help="choose dns password (otherwise random)")
parser.add_option("--ldapadminpass", type="string", metavar="PASSWORD",