sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-26 21:57:41 +03:00
Code

provision: Always create DNS user.

Browse Source 
The DNS user is currently only used by the bind9 plugin. This makes it
easier to later on switch between the builtin DNS server and bind
backend.

In addition, ideally the internal DNS server would use that (separate)
user too.

Autobuild-User(master): Jelmer Vernooij <jelmer@samba.org>
Autobuild-Date(master): Thu Oct 11 17:05:40 CEST 2012 on sn-devel-104
This commit is contained in:
Jelmer Vernooij 2012-10-11 14:45:10 +02:00
parent 276460cf8a
commit c2d14747d6
1 changed files with 13 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -969,7 +969,7 @@ def setup_samdb_rootdse(samdb, names):
def setup_self_join(samdb, admin_session_info, names, fill, machinepass, def setup_self_join(samdb, admin_session_info, names, fill, machinepass,
dns_backend, dnspass, domainsid, next_rid, invocationid, dnspass, domainsid, next_rid, invocationid,
policyguid, policyguid_dc, policyguid, policyguid_dc,
domainControllerFunctionality, ntdsguid=None, dc_rid=None): domainControllerFunctionality, ntdsguid=None, dc_rid=None):
"""Join a host to its own domain.""" """Join a host to its own domain."""
@ -1048,17 +1048,14 @@ def setup_self_join(samdb, admin_session_info, names, fill, machinepass,
samdb.set_session_info(admin_session_info) samdb.set_session_info(admin_session_info)
if dns_backend != "SAMBA_INTERNAL": setup_add_ldif(samdb, setup_path("provision_dns_add_samba.ldif"), {
# This is Samba4 specific and should be replaced by the correct "DNSDOMAIN": names.dnsdomain,
# DNS AD-style setup "DOMAINDN": names.domaindn,
setup_add_ldif(samdb, setup_path("provision_dns_add_samba.ldif"), { "DNSPASS_B64": b64encode(dnspass.encode('utf-16-le')),
"DNSDOMAIN": names.dnsdomain, "HOSTNAME" : names.hostname,
"DOMAINDN": names.domaindn, "DNSNAME" : '%s.%s' % (
"DNSPASS_B64": b64encode(dnspass.encode('utf-16-le')), names.netbiosname.lower(), names.dnsdomain.lower())
"HOSTNAME" : names.hostname, })
"DNSNAME" : '%s.%s' % (
names.netbiosname.lower(), names.dnsdomain.lower())
})
def getpolicypath(sysvolpath, dnsdomain, guid): def getpolicypath(sysvolpath, dnsdomain, guid):
@ -1146,7 +1143,7 @@ def setup_samdb(path, session_info, provision_backend, lp, names,
def fill_samdb(samdb, lp, names, logger, domainsid, domainguid, policyguid, def fill_samdb(samdb, lp, names, logger, domainsid, domainguid, policyguid,
policyguid_dc, fill, adminpass, krbtgtpass, machinepass, dns_backend, policyguid_dc, fill, adminpass, krbtgtpass, machinepass,
dnspass, invocationid, ntdsguid, serverrole, am_rodc=False, dnspass, invocationid, ntdsguid, serverrole, am_rodc=False,
dom_for_fun_level=None, schema=None, next_rid=None, dc_rid=None): dom_for_fun_level=None, schema=None, next_rid=None, dc_rid=None):
@ -1334,7 +1331,6 @@ def fill_samdb(samdb, lp, names, logger, domainsid, domainguid, policyguid,
logger.info("Setting up self join") logger.info("Setting up self join")
setup_self_join(samdb, admin_session_info, names=names, fill=fill, setup_self_join(samdb, admin_session_info, names=names, fill=fill,
invocationid=invocationid, invocationid=invocationid,
dns_backend=dns_backend,
dnspass=dnspass, dnspass=dnspass,
machinepass=machinepass, machinepass=machinepass,
domainsid=domainsid, domainsid=domainsid,
@ -1607,8 +1603,8 @@ def provision_fill(samdb, secrets_ldb, logger, names, paths,
next_rid=1000, dc_rid=None, adminpass=None, krbtgtpass=None, next_rid=1000, dc_rid=None, adminpass=None, krbtgtpass=None,
domainguid=None, policyguid=None, policyguid_dc=None, domainguid=None, policyguid=None, policyguid_dc=None,
invocationid=None, machinepass=None, ntdsguid=None, invocationid=None, machinepass=None, ntdsguid=None,
dns_backend=None, dnspass=None, dns_backend=None,
serverrole=None, dom_for_fun_level=None, dnspass=None, serverrole=None, dom_for_fun_level=None,
am_rodc=False, lp=None, use_ntvfs=False, skip_sysvolacl=False): am_rodc=False, lp=None, use_ntvfs=False, skip_sysvolacl=False):
# create/adapt the group policy GUIDs # create/adapt the group policy GUIDs
# Default GUID for default policy are described at # Default GUID for default policy are described at
@ -1636,8 +1632,7 @@ def provision_fill(samdb, secrets_ldb, logger, names, paths,
policyguid=policyguid, policyguid_dc=policyguid_dc, policyguid=policyguid, policyguid_dc=policyguid_dc,
fill=samdb_fill, adminpass=adminpass, krbtgtpass=krbtgtpass, fill=samdb_fill, adminpass=adminpass, krbtgtpass=krbtgtpass,
invocationid=invocationid, machinepass=machinepass, invocationid=invocationid, machinepass=machinepass,
dns_backend=dns_backend, dnspass=dnspass, dnspass=dnspass, ntdsguid=ntdsguid, serverrole=serverrole,
ntdsguid=ntdsguid, serverrole=serverrole,
dom_for_fun_level=dom_for_fun_level, am_rodc=am_rodc, dom_for_fun_level=dom_for_fun_level, am_rodc=am_rodc,
next_rid=next_rid, dc_rid=dc_rid) next_rid=next_rid, dc_rid=dc_rid)