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-provision: Make BIND9_DLZ as the default backend for DNS

Browse Source
This commit is contained in:
Amitay Isaacs
2011-11-25 15:43:53 +11:00
parent 7ac5c5061e
commit 1e935d1bdc
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source4/scripting/python/samba/join.py
View File

@ -619,7 +619,7 @@ class dc_join(object):
targetdir=ctx.targetdir, samdb_fill=FILL_SUBDOMAIN,
machinepass=ctx.acct_pass, serverrole="domain controller",
lp=ctx.lp, hostip=ctx.names.hostip, hostip6=ctx.names.hostip6,
dns_backend="BIND9_FLATFILE")
dns_backend="BIND9_DLZ")
print("Provision OK for domain %s" % ctx.names.dnsdomain)
def join_replicate(ctx):

2
source4/scripting/python/samba/upgrade.py
View File

@ -626,7 +626,7 @@ Please fix this account before attempting to upgrade again
raise ProvisioningError("Please remove duplicate sid entries before upgrade.")
if serverrole == "ROLE_DOMAIN_BDC" or serverrole == "ROLE_DOMAIN_PDC":
dns_backend = "BIND9_FLATFILE"
dns_backend = "BIND9_DLZ"
else:
dns_backend = "NONE"

2
source4/scripting/python/samba/upgradehelpers.py
View File

@ -256,7 +256,7 @@ def newprovision(names, creds, session, smbconf, provdir, logger):
shutil.rmtree(provdir)
os.mkdir(provdir)
logger.info("Provision stored in %s", provdir)
dns_backend="BIND9_FLATFILE"
dns_backend="BIND9_DLZ"
provision(logger, session, creds, smbconf=smbconf,
targetdir=provdir, samdb_fill=FILL_FULL, realm=names.realm,
domain=names.domain, domainguid=names.domainguid,

6
source4/setup/provision
View File

@ -84,8 +84,8 @@ parser.add_option("--machinepass", type="string", metavar="PASSWORD",
parser.add_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, " \
"BIND9_FLATFILE uses bind9 text database to store zone information (default), " \
"BIND9_DLZ uses samba4 AD to store zone information, " \
"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)")
parser.add_option("--dnspass", type="string", metavar="PASSWORD",
help="choose dns password (otherwise random)")
@ -204,7 +204,7 @@ 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"
dns_backend = "BIND9_DLZ"
else:
dns_backend = opts.dns_backend