sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-08-03 04:22:09 +03:00
Code Activity

s4 dns: use the internal DNS server per default

Browse Source
This commit is contained in:
Kai Blin
2012-09-11 09:07:47 +02:00
committed by Stefan Metzmacher
parent 2af8129085
commit 56058ea597
4 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source4/scripting/bin/samba_upgradedns
View File

@ -238,8 +238,8 @@ if __name__ == '__main__':
parser.add_option_group(credopts) parser.add_option_group(credopts)
parser.add_option("--dns-backend", type="choice", metavar="<BIND9_DLZ|SAMBA_INTERNAL>", parser.add_option("--dns-backend", type="choice", metavar="<BIND9_DLZ|SAMBA_INTERNAL>",
choices=["SAMBA_INTERNAL", "BIND9_DLZ"], default="BIND9_DLZ", choices=["SAMBA_INTERNAL", "BIND9_DLZ"], default="SAMBA_INTERNAL",
help="The DNS server backend, default BIND9_DLZ") help="The DNS server backend, default SAMBA_INTERNAL")
parser.add_option("--migrate", type="choice", metavar="<yes|no>", parser.add_option("--migrate", type="choice", metavar="<yes|no>",
choices=["yes","no"], default="yes", choices=["yes","no"], default="yes",
help="Migrate existing zone data, default yes") help="Migrate existing zone data, default yes")
@ -248,7 +248,7 @@ if __name__ == '__main__':
opts = parser.parse_args()[0] opts = parser.parse_args()[0]
if opts.dns_backend is None: if opts.dns_backend is None:
opts.dns_backend = 'DLZ_BIND9' opts.dns_backend = 'SAMBA_INTERNAL'
if opts.migrate: if opts.migrate:
autofill = False autofill = False

26
source4/scripting/python/samba/netcmd/domain.py
View File

@ -174,11 +174,11 @@ class cmd_domain_provision(Command):
help="choose machine password (otherwise random)"), help="choose machine password (otherwise random)"),
Option("--dns-backend", type="choice", metavar="NAMESERVER-BACKEND", Option("--dns-backend", type="choice", metavar="NAMESERVER-BACKEND",
choices=["SAMBA_INTERNAL", "BIND9_FLATFILE", "BIND9_DLZ", "NONE"], 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_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)", "NONE skips the DNS setup entirely (not recommended)",
default="BIND9_DLZ"), default="SAMBA_INTERNAL"),
Option("--dnspass", type="string", metavar="PASSWORD", Option("--dnspass", type="string", metavar="PASSWORD",
help="choose dns password (otherwise random)"), help="choose dns password (otherwise random)"),
Option("--ldapadminpass", type="string", metavar="PASSWORD", Option("--ldapadminpass", type="string", metavar="PASSWORD",
@ -297,7 +297,7 @@ class cmd_domain_provision(Command):
server_role = ask("Server Role (dc, member, standalone)", "dc") 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, ''): if dns_backend in (None, ''):
raise CommandError("No DNS backend set!") raise CommandError("No DNS backend set!")
@ -412,10 +412,10 @@ class cmd_domain_dcpromo(Command):
action="store_true"), action="store_true"),
Option("--dns-backend", type="choice", metavar="NAMESERVER-BACKEND", Option("--dns-backend", type="choice", metavar="NAMESERVER-BACKEND",
choices=["SAMBA_INTERNAL", "BIND9_DLZ", "NONE"], choices=["SAMBA_INTERNAL", "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_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)", "NONE skips the DNS setup entirely (this DC will not be a DNS server)",
default="BIND9_DLZ") default="SAMBA_INTERNAL")
] ]
takes_args = ["domain", "role?"] takes_args = ["domain", "role?"]
@ -479,10 +479,10 @@ class cmd_domain_join(Command):
action="store_true"), action="store_true"),
Option("--dns-backend", type="choice", metavar="NAMESERVER-BACKEND", Option("--dns-backend", type="choice", metavar="NAMESERVER-BACKEND",
choices=["SAMBA_INTERNAL", "BIND9_DLZ", "NONE"], choices=["SAMBA_INTERNAL", "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_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)", "NONE skips the DNS setup entirely (this DC will not be a DNS server)",
default="BIND9_DLZ") default="SAMBA_INTERNAL")
] ]
takes_args = ["domain", "role?"] takes_args = ["domain", "role?"]
@ -1177,11 +1177,11 @@ class cmd_domain_classicupgrade(Command):
action="store_true"), action="store_true"),
Option("--dns-backend", type="choice", metavar="NAMESERVER-BACKEND", Option("--dns-backend", type="choice", metavar="NAMESERVER-BACKEND",
choices=["SAMBA_INTERNAL", "BIND9_FLATFILE", "BIND9_DLZ", "NONE"], 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_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)", "NONE skips the DNS setup entirely (this DC will not be a DNS server)",
default="BIND9_DLZ") default="SAMBA_INTERNAL")
] ]
takes_args = ["smbconf"] takes_args = ["smbconf"]

4
source4/scripting/python/samba/provision/__init__.py
View File

@ -1816,8 +1816,8 @@ def provision(logger, session_info, credentials, smbconf=None,
if use_rfc2307: if use_rfc2307:
global_param["idmap_ldb:use rfc2307"] = ["yes"] global_param["idmap_ldb:use rfc2307"] = ["yes"]
if dns_backend == "SAMBA_INTERNAL": if dns_backend != "SAMBA_INTERNAL":
server_services.append("+dns") server_services.append("-dns")
if use_ntvfs: if use_ntvfs:
server_services.append("+smb") server_services.append("+smb")

6
wintest/wintest.py
View File

@ -900,11 +900,11 @@ RebootOnCompletion=No
self.parser.add_option("--use-ntvfs", action='store_true', default=False, help='use NTVFS for the fileserver') self.parser.add_option("--use-ntvfs", action='store_true', default=False, help='use NTVFS for the fileserver')
self.parser.add_option("--dns-backend", type="choice", self.parser.add_option("--dns-backend", type="choice",
choices=["SAMBA_INTERNAL", "BIND9_FLATFILE", "BIND9_DLZ", "NONE"], 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_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)", "NONE skips the DNS setup entirely (not recommended)",
default="BIND9_DLZ") default="SAMBA_INTERNAL")
self.opts, self.args = self.parser.parse_args() self.opts, self.args = self.parser.parse_args()