diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2008-03-13 11:36:58 +1100 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2008-03-13 11:36:58 +1100 |
| commit | 0c882402360a10b19a038bce9f87e241051c9ba8 (patch) | |
| tree | 8960d76500aa521aaad5a33ba3ae3146d782c338 /source4/scripting/python | |
| parent | 58edd6d17951553cb6b693b37ce88454668b1c50 (diff) | |
| download | samba-0c882402360a10b19a038bce9f87e241051c9ba8.tar.gz samba-0c882402360a10b19a038bce9f87e241051c9ba8.tar.bz2 samba-0c882402360a10b19a038bce9f87e241051c9ba8.zip | |
Rework to have member server 'domains' be CN=NETBIOSNAME
This reworks quite a few parts of our provision system to use
CN=NETBIOSNAME as the domain for member servers.
This makes it clear that these domains are not in the DNS structure,
while complying with our own schema (found by OpenLDAP's schema
validation).
Andrew Bartlett
(This used to be commit bda6a38b055fed2394e65cdc0b308a1442116402)
Diffstat (limited to 'source4/scripting/python')
| -rw-r--r-- | source4/scripting/python/samba/provision.py | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py index f9604a84b2..25316e888a 100644 --- a/source4/scripting/python/samba/provision.py +++ b/source4/scripting/python/samba/provision.py @@ -763,9 +763,15 @@ def setup_samdb(path, setup_path, session_info, credentials, lp, try: message("Adding DomainDN: %s (permitted to fail)" % names.domaindn) + if serverrole == "domain controller": + domain_oc = "domainDNS" + else: + domain_oc = "samba4LocalDomain" + setup_add_ldif(samdb, setup_path("provision_basedn.ldif"), { "DOMAINDN": names.domaindn, "ACI": aci, + "DOMAIN_OC": domain_oc }) message("Modifying DomainDN: " + names.domaindn + "") |