sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-08-04 08:22:08 +03:00
Code Activity

provision/sambadns: CN=MicrosoftDNS,CN=System, is relative to DOMAINDN

Browse Source 
Signed-off-by: Stefan Metzmacher <metze@samba.org>

Reviewed-by: Andrew Bartlett <abartlet@samba.org>

Autobuild-User(master): Stefan Metzmacher <metze@samba.org>
Autobuild-Date(master): Thu Oct 10 10:24:55 CEST 2013 on sn-devel-104
This commit is contained in:
Stefan Metzmacher
2013-10-09 09:37:52 +02:00
parent a90067ec8e
commit a2d45cf49e
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
python/samba/provision/sambadns.py
View File

@ -1021,18 +1021,18 @@ def setup_ad_dns(samdb, secretsdb, domainsid, names, paths, lp, logger,
add_dns_accounts(samdb, names.domaindn) add_dns_accounts(samdb, names.domaindn)
# If dns_backend is BIND9_FLATFILE # If dns_backend is BIND9_FLATFILE
# Populate only CN=MicrosoftDNS,CN=System,<FORESTDN> # Populate only CN=MicrosoftDNS,CN=System,<DOMAINDN>
# #
# If dns_backend is SAMBA_INTERNAL or BIND9_DLZ # If dns_backend is SAMBA_INTERNAL or BIND9_DLZ
# Populate DNS partitions # Populate DNS partitions
# If os_level < 2003 (DS_DOMAIN_FUNCTION_2000) # If os_level < 2003 (DS_DOMAIN_FUNCTION_2000)
# All dns records are in CN=MicrosoftDNS,CN=System,<FORESTDN> # All dns records are in CN=MicrosoftDNS,CN=System,<DOMAINDN>
# #
# If os_level >= 2003 (DS_DOMAIN_FUNCTION_2003, DS_DOMAIN_FUNCTION_2008, # If os_level >= 2003 (DS_DOMAIN_FUNCTION_2003, DS_DOMAIN_FUNCTION_2008,
# DS_DOMAIN_FUNCTION_2008_R2) # DS_DOMAIN_FUNCTION_2008_R2)
# Root server records are in CN=MicrosoftDNS,CN=System,<FORESTDN> # Root server records are in CN=MicrosoftDNS,CN=System,<DOMAINDN>
# Domain records are in CN=MicrosoftDNS,CN=System,<FORESTDN> # Domain records are in CN=MicrosoftDNS,CN=System,<DOMAINDN>
# Domain records are in CN=MicrosoftDNS,DC=DomainDnsZones,<DOMAINDN> # Domain records are in CN=MicrosoftDNS,DC=DomainDnsZones,<DOMAINDN>
# Forest records are in CN=MicrosoftDNS,DC=ForestDnsZones,<FORESTDN> # Forest records are in CN=MicrosoftDNS,DC=ForestDnsZones,<FORESTDN>
domaindn = names.domaindn domaindn = names.domaindn
@ -1047,13 +1047,13 @@ def setup_ad_dns(samdb, secretsdb, domainsid, names, paths, lp, logger,
domainguid = get_domainguid(samdb, domaindn) domainguid = get_domainguid(samdb, domaindn)
# Create CN=System # Create CN=System
logger.info("Creating CN=MicrosoftDNS,CN=System,%s" % forestdn) logger.info("Creating CN=MicrosoftDNS,CN=System,%s" % domaindn)
create_dns_legacy(samdb, domainsid, forestdn, dnsadmins_sid) create_dns_legacy(samdb, domainsid, domaindn, dnsadmins_sid)
if os_level == DS_DOMAIN_FUNCTION_2000: if os_level == DS_DOMAIN_FUNCTION_2000:
# Populating legacy dns # Populating legacy dns
logger.info("Populating CN=MicrosoftDNS,CN=System,%s" % forestdn) logger.info("Populating CN=MicrosoftDNS,CN=System,%s" % domaindn)
fill_dns_data_legacy(samdb, domainsid, forestdn, dnsdomain, site, fill_dns_data_legacy(samdb, domainsid, domaindn, dnsdomain, site,
hostname, hostip, hostip6, dnsadmins_sid) hostname, hostip, hostip6, dnsadmins_sid)
elif dns_backend in ("SAMBA_INTERNAL", "BIND9_DLZ") and \ elif dns_backend in ("SAMBA_INTERNAL", "BIND9_DLZ") and \