provision: Simplify handling of default for --dns-backend option.
authorJelmer Vernooij <jelmer@samba.org>
Sun, 15 Apr 2012 21:35:07 +0000 (23:35 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Mon, 16 Apr 2012 14:30:18 +0000 (16:30 +0200)
source4/setup/provision

index 523b082827aac6c6327ceee662f52e4719b2dd15..f4bfe13c71079e61e2a11a8ac84a57c6e1257cc1 100755 (executable)
@@ -86,7 +86,8 @@ parser.add_option("--dns-backend", type="choice", metavar="NAMESERVER-BACKEND",
         help="The DNS server backend. SAMBA_INTERNAL is the builtin name server, " \
              "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)")
+             "NONE skips the DNS setup entirely (not recommended)",
+        default="BIND9_DLZ")
 parser.add_option("--dnspass", type="string", metavar="PASSWORD",
         help="choose dns password (otherwise random)")
 parser.add_option("--ldapadminpass", type="string", metavar="PASSWORD",
@@ -210,11 +211,6 @@ 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_DLZ"
-else:
-    dns_backend = opts.dns_backend
-
 creds = credopts.get_credentials(lp)
 
 creds.set_kerberos_state(DONT_USE_KERBEROS)