summaryrefslogtreecommitdiff
path: root/source4/scripting
diff options
context:
space:
mode:
authorAmitay Isaacs <amitay@gmail.com>2011-12-08 17:34:57 +1100
committerAmitay Isaacs <amitay@gmail.com>2011-12-13 00:55:32 +1100
commiteee2191076472db3773d9ef2a900c744abe2a768 (patch)
treec558b607b780f17b2e86c1b70ced3d900718f239 /source4/scripting
parentf02e4ebfafa6e5911e3fe744b1780527ab12c970 (diff)
downloadsamba-eee2191076472db3773d9ef2a900c744abe2a768.tar.gz
samba-eee2191076472db3773d9ef2a900c744abe2a768.tar.bz2
samba-eee2191076472db3773d9ef2a900c744abe2a768.zip
s4-provision: CN=MicrosoftDNS,CN=System container is in forest and not domain
Diffstat (limited to 'source4/scripting')
-rw-r--r--source4/scripting/python/samba/provision/sambadns.py20
1 files changed, 10 insertions, 10 deletions
diff --git a/source4/scripting/python/samba/provision/sambadns.py b/source4/scripting/python/samba/provision/sambadns.py
index bffb621af8..b3e5bdc64b 100644
--- a/source4/scripting/python/samba/provision/sambadns.py
+++ b/source4/scripting/python/samba/provision/sambadns.py
@@ -819,20 +819,20 @@ def setup_ad_dns(samdb, secretsdb, domainsid, names, paths, lp, logger, dns_back
return
# If dns_backend is BIND9_FLATFILE
- # Populate only CN=MicrosoftDNS,CN=System,<DOMAINDN>
+ # Populate only CN=MicrosoftDNS,CN=System,<FORESTDN>
#
# If dns_backend is SAMBA_INTERNAL or BIND9_DLZ
# Populate DNS partitions
# If os_level < 2003 (DS_DOMAIN_FUNCTION_2000)
- # All dns records are in CN=MicrosoftDNS,CN=System,<DOMAINDN>
+ # All dns records are in CN=MicrosoftDNS,CN=System,<FORESTDN>
#
# If os_level >= 2003 (DS_DOMAIN_FUNCTION_2003, DS_DOMAIN_FUNCTION_2008,
# DS_DOMAIN_FUNCTION_2008_R2)
- # Root server records are in CN=MicrosoftDNS,CN=System,<DOMAINDN>
- # Domain records are in CN=MicrosoftDNS,CN=System,<DOMAINDN>
+ # Root server records are in CN=MicrosoftDNS,CN=System,<FORESTDN>
+ # Domain records are in CN=MicrosoftDNS,CN=System,<FORESTDN>
# Domain records are in CN=MicrosoftDNS,DC=DomainDnsZones,<DOMAINDN>
- # Forest records are in CN=MicrosoftDNS,DC=ForestDnsZones,<DOMAINDN>
+ # Forest records are in CN=MicrosoftDNS,DC=ForestDnsZones,<FORESTDN>
domaindn = names.domaindn
forestdn = samdb.get_root_basedn().get_linearized()
@@ -850,21 +850,21 @@ def setup_ad_dns(samdb, secretsdb, domainsid, names, paths, lp, logger, dns_back
add_dns_accounts(samdb, domaindn)
dnsadmins_sid = get_dnsadmins_sid(samdb, domaindn)
- logger.info("Populating CN=MicrosoftDNS,CN=System,%s" % domaindn)
+ logger.info("Populating CN=MicrosoftDNS,CN=System,%s" % forestdn)
# Set up MicrosoftDNS container
- add_dns_container(samdb, domaindn, "CN=System", domainsid, dnsadmins_sid)
+ add_dns_container(samdb, forestdn, "CN=System", domainsid, dnsadmins_sid)
# Add root servers
- add_rootservers(samdb, domaindn, "CN=System")
+ add_rootservers(samdb, forestdn, "CN=System")
if os_level == DS_DOMAIN_FUNCTION_2000:
# Add domain record
- add_domain_record(samdb, domaindn, "CN=System", dnsdomain, domainsid, dnsadmins_sid)
+ add_domain_record(samdb, forestdn, "CN=System", dnsdomain, domainsid, dnsadmins_sid)
# Add DNS records for a DC in domain
- add_dc_domain_records(samdb, domaindn, "CN=System", site, dnsdomain,
+ add_dc_domain_records(samdb, forestdn, "CN=System", site, dnsdomain,
hostname, hostip, hostip6)
elif dns_backend in ("SAMBA_INTERNAL", "BIND9_DLZ") and \