diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2012-04-15 23:35:07 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2012-04-16 16:30:18 +0200 |
| commit | efa594820ad8be86148b8e36f5a623f8346edea0 (patch) | |
| tree | 1f6fbee5e7d19bd89e989e4f39f209ae6f385f69 | |
| parent | dd0b8792a0cb1b5f659bab8163bc1e71d9a4b3c9 (diff) | |
| download | samba-efa594820ad8be86148b8e36f5a623f8346edea0.tar.gz samba-efa594820ad8be86148b8e36f5a623f8346edea0.tar.bz2 samba-efa594820ad8be86148b8e36f5a623f8346edea0.zip | |
provision: Simplify handling of default for --dns-backend option.
| -rwxr-xr-x | source4/setup/provision | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/source4/setup/provision b/source4/setup/provision index 523b082827..f4bfe13c71 100755 --- a/source4/setup/provision +++ b/source4/setup/provision @@ -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) |