summaryrefslogtreecommitdiff
path: root/source4/scripting
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2009-10-12 16:44:19 +1100
committerAndrew Bartlett <abartlet@samba.org>2009-10-12 16:50:49 +1100
commit1dfa2ed42361bb8d22446513a85f0523a740982c (patch)
treeabc83bb42766b710a4737c72a2e49558069574fb /source4/scripting
parent0bfc3023a1f2810f096ba282bc64ccb09d3cfe3e (diff)
downloadsamba-1dfa2ed42361bb8d22446513a85f0523a740982c.tar.gz
samba-1dfa2ed42361bb8d22446513a85f0523a740982c.tar.bz2
samba-1dfa2ed42361bb8d22446513a85f0523a740982c.zip
s4:provision Remove all references to samba4LocalDomain
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
Diffstat (limited to 'source4/scripting')
-rw-r--r--source4/scripting/python/samba/provision.py7
1 files changed, 1 insertions, 6 deletions
diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py
index b6ae747c70..509f13d980 100644
--- a/source4/scripting/python/samba/provision.py
+++ b/source4/scripting/python/samba/provision.py
@@ -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
})