s4 provision: Reword opinionated dns backend help text, add NONE backend

diff --git a/source4/scripting/python/samba/provision/sambadns.py b/source4/scripting/python/samba/provision/sambadns.py
index b83be18a7245038f4f77eeb9bc35861b42e0b8ff..ee2dd3bacfdbe88c9dcad505bd90275d3ca6ad31 100644 (file)
--- a/source4/scripting/python/samba/provision/sambadns.py
+++ b/source4/scripting/python/samba/provision/sambadns.py
@@ -465,7 +465,7 @@ def setup_ad_dns(samdb, names, logger, hostip=None, hostip6=None, dns_backend=No
     # If dns_backend is BIND9_FLATFILE
     #   Populate only CN=MicrosoftDNS,CN=System,<DOMAINDN>
     #
-    # If dns_backend is SAMBA or BIND9_DLZ 
+    # If dns_backend is SAMBA_INTERNAL or BIND9_DLZ
     #   Populate DNS partitions
 
     if os_level is None:
@@ -514,7 +514,7 @@ def setup_ad_dns(samdb, names, logger, hostip=None, hostip6=None, dns_backend=No
         add_dc_domain_records(samdb, domaindn, "CN=System", site, dnsdomain,
                                 hostname, hostip, hostip6)
 
-    elif (dns_backend == "SAMBA" or dns_backend == "BIND9_DLZ") and (
+    elif (dns_backend == "SAMBA_INTERNAL" or dns_backend == "BIND9_DLZ") and (
             os_level == DS_DOMAIN_FUNCTION_2003 or
             os_level == DS_DOMAIN_FUNCTION_2008 or
             os_level == DS_DOMAIN_FUNCTION_2008_R2):

diff --git a/source4/setup/provision b/source4/setup/provision
index a1c403fc19f124593fc662455a1b0bbd6cf9f0e9..713623c551b6f63a0d5ec08a49f275c90ac20eb5 100755 (executable)
--- a/source4/setup/provision
+++ b/source4/setup/provision
@@ -82,8 +82,11 @@ 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_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)")
+          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, " \
+             "NONE skips the DNS setup entirely (not recommended)")
 parser.add_option("--dnspass", type="string", metavar="PASSWORD",
         help="choose dns password (otherwise random)")
 parser.add_option("--ldapadminpass", type="string", metavar="PASSWORD",
@@ -213,6 +216,11 @@ elif opts.function_level == "2008":
 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"
+else:
+    dns_backend = opts.dns_backend
+
 creds = credopts.get_credentials(lp)
 
 creds.set_kerberos_state(DONT_USE_KERBEROS)
@@ -261,7 +269,7 @@ try:
           ntdsguid=opts.ntds_guid,
           invocationid=opts.invocationid, adminpass=opts.adminpass,
           krbtgtpass=opts.krbtgtpass, machinepass=opts.machinepass,
-          dns_backend=opts.dns_backend,
+          dns_backend=dns_backend,
           dnspass=opts.dnspass, root=opts.root, nobody=opts.nobody,
           wheel=opts.wheel, users=opts.users,
           serverrole=server_role, dom_for_fun_level=dom_for_fun_level,