diff options
| author | Kai Blin <kai@samba.org> | 2012-09-11 09:07:47 +0200 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2012-09-12 16:51:29 +0200 |
| commit | 56058ea597836ed61a8abcd3c26732f2829ee641 (patch) | |
| tree | 86cda9ded42617cee9a3e6d76307011ebaa91699 /source4/scripting/python/samba/netcmd/domain.py | |
| parent | 2af8129085042b51ac052653942116ad5998f701 (diff) | |
| download | samba-56058ea597836ed61a8abcd3c26732f2829ee641.tar.gz samba-56058ea597836ed61a8abcd3c26732f2829ee641.tar.xz samba-56058ea597836ed61a8abcd3c26732f2829ee641.zip | |
s4 dns: use the internal DNS server per default
Diffstat (limited to 'source4/scripting/python/samba/netcmd/domain.py')
| -rw-r--r-- | source4/scripting/python/samba/netcmd/domain.py | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/source4/scripting/python/samba/netcmd/domain.py b/source4/scripting/python/samba/netcmd/domain.py index d35ee577ea9..119c19757f8 100644 --- a/source4/scripting/python/samba/netcmd/domain.py +++ b/source4/scripting/python/samba/netcmd/domain.py @@ -174,11 +174,11 @@ class cmd_domain_provision(Command): help="choose machine password (otherwise random)"), 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, " \ + help="The DNS server backend. SAMBA_INTERNAL is the builtin name server (default), " \ "BIND9_FLATFILE uses bind9 text database to store zone information, " \ - "BIND9_DLZ uses samba4 AD to store zone information (default), " \ + "BIND9_DLZ uses samba4 AD to store zone information, " \ "NONE skips the DNS setup entirely (not recommended)", - default="BIND9_DLZ"), + default="SAMBA_INTERNAL"), Option("--dnspass", type="string", metavar="PASSWORD", help="choose dns password (otherwise random)"), Option("--ldapadminpass", type="string", metavar="PASSWORD", @@ -297,7 +297,7 @@ class cmd_domain_provision(Command): server_role = ask("Server Role (dc, member, standalone)", "dc") - dns_backend = ask("DNS backend (SAMBA_INTERNAL, BIND9_FLATFILE, BIND9_DLZ, NONE)", "BIND9_DLZ") + dns_backend = ask("DNS backend (SAMBA_INTERNAL, BIND9_FLATFILE, BIND9_DLZ, NONE)", "SAMBA_INTERNAL") if dns_backend in (None, ''): raise CommandError("No DNS backend set!") @@ -412,10 +412,10 @@ class cmd_domain_dcpromo(Command): action="store_true"), Option("--dns-backend", type="choice", metavar="NAMESERVER-BACKEND", choices=["SAMBA_INTERNAL", "BIND9_DLZ", "NONE"], - help="The DNS server backend. SAMBA_INTERNAL is the builtin name server, " \ - "BIND9_DLZ uses samba4 AD to store zone information (default), " \ + help="The DNS server backend. SAMBA_INTERNAL is the builtin name server (default), " \ + "BIND9_DLZ uses samba4 AD to store zone information, " \ "NONE skips the DNS setup entirely (this DC will not be a DNS server)", - default="BIND9_DLZ") + default="SAMBA_INTERNAL") ] takes_args = ["domain", "role?"] @@ -479,10 +479,10 @@ class cmd_domain_join(Command): action="store_true"), Option("--dns-backend", type="choice", metavar="NAMESERVER-BACKEND", choices=["SAMBA_INTERNAL", "BIND9_DLZ", "NONE"], - help="The DNS server backend. SAMBA_INTERNAL is the builtin name server, " \ - "BIND9_DLZ uses samba4 AD to store zone information (default), " \ + help="The DNS server backend. SAMBA_INTERNAL is the builtin name server (default), " \ + "BIND9_DLZ uses samba4 AD to store zone information, " \ "NONE skips the DNS setup entirely (this DC will not be a DNS server)", - default="BIND9_DLZ") + default="SAMBA_INTERNAL") ] takes_args = ["domain", "role?"] @@ -1177,11 +1177,11 @@ class cmd_domain_classicupgrade(Command): action="store_true"), 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, " \ + help="The DNS server backend. SAMBA_INTERNAL is the builtin name server (default), " \ "BIND9_FLATFILE uses bind9 text database to store zone information, " \ - "BIND9_DLZ uses samba4 AD to store zone information (default), " \ + "BIND9_DLZ uses samba4 AD to store zone information, " \ "NONE skips the DNS setup entirely (this DC will not be a DNS server)", - default="BIND9_DLZ") + default="SAMBA_INTERNAL") ] takes_args = ["smbconf"] |