sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-22 13:34:15 +03:00
Code

join.py: Correct ctx.forestdns_zone and so remove the need for duplicate repl.replicate() call

Browse Source 
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
This commit is contained in:
Andrew Bartlett 2013-10-11 09:36:53 +13:00 committed by Stefan Metzmacher
parent 48b979c4fe
commit a8c6dd5438
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
python/samba/join.py
View File

@ -119,7 +119,7 @@ class dc_join(object):
ctx.dnsdomain = ctx.samdb.domain_dns_name() ctx.dnsdomain = ctx.samdb.domain_dns_name()
ctx.dnsforest = ctx.samdb.forest_dns_name() ctx.dnsforest = ctx.samdb.forest_dns_name()
ctx.domaindns_zone = 'DC=DomainDnsZones,%s' % ctx.base_dn ctx.domaindns_zone = 'DC=DomainDnsZones,%s' % ctx.base_dn
ctx.forestdns_zone = 'DC=ForestDnsZones,%s' % ctx.base_dn ctx.forestdns_zone = 'DC=ForestDnsZones,%s' % ctx.root_dn
res_domaindns = ctx.samdb.search(scope=ldb.SCOPE_ONELEVEL, res_domaindns = ctx.samdb.search(scope=ldb.SCOPE_ONELEVEL,
attrs=[], attrs=[],
@ -830,10 +830,6 @@ class dc_join(object):
destination_dsa_guid, rodc=ctx.RODC, destination_dsa_guid, rodc=ctx.RODC,
replica_flags=ctx.replica_flags) replica_flags=ctx.replica_flags)
if 'DC=ForestDnsZones,%s' % ctx.root_dn in ctx.nc_list:
repl.replicate('DC=ForestDnsZones,%s' % ctx.root_dn, source_dsa_invocation_id,
destination_dsa_guid, rodc=ctx.RODC,
replica_flags=ctx.replica_flags)
# FIXME At this point we should add an entry in the forestdns and domaindns NC # FIXME At this point we should add an entry in the forestdns and domaindns NC
# (those under CN=Partions,DC=...) # (those under CN=Partions,DC=...)
# in order to indicate that we hold a replica for this NC # in order to indicate that we hold a replica for this NC