sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-07-21 12:59:09 +03:00
Code Activity

s4:provision Remove all references to samba4LocalDomain

Browse Source 
This was a bad idea all along, as Simo said at the time.  With the
full MS schema and enforcement of it, it is an even worse idea.

This fixes the provision of the member server in 'make test'

Andrew Bartlett
This commit is contained in:
Andrew Bartlett
2009-10-12 16:44:19 +11:00
parent 0bfc3023a1
commit 1dfa2ed423
6 changed files with 32 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
source4/scripting/python/samba/provision.py
View File

@ -454,7 +454,7 @@ def guess_names(lp=None, hostname=None, domain=None, dnsdomain=None,
else:
domain = netbiosname
if domaindn is None:
domaindn = "CN=" + netbiosname
domaindn = "DC=" + netbiosname
assert domain is not None
domain = domain.upper()
@ -1010,10 +1010,6 @@ def setup_samdb(path, setup_path, session_info, credentials, lp,
samdb.set_invocation_id(invocationid)
message("Adding DomainDN: %s" % names.domaindn)
if serverrole == "domain controller":
domain_oc = "domainDNS"
else:
domain_oc = "samba4LocalDomain"
#impersonate domain admin
admin_session_info = admin_session(lp, str(domainsid))
@ -1024,7 +1020,6 @@ def setup_samdb(path, setup_path, session_info, credentials, lp,
domainguid_line = ""
setup_add_ldif(samdb, setup_path("provision_basedn.ldif"), {
"DOMAINDN": names.domaindn,
"DOMAIN_OC": domain_oc,
"DOMAINGUID": domainguid_line
})