diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2013-10-11 09:36:53 +1300 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2013-10-11 08:33:00 +0200 |
| commit | a8c6dd54381412201051fdc78f13e60ec9c47de6 (patch) | |
| tree | f1a14c95f49d0e8eb1cb2614edd4c830be11a7ce | |
| parent | 48b979c4fec39c8d3b9684b4a759715c0f93e9cc (diff) | |
| download | samba-a8c6dd54381412201051fdc78f13e60ec9c47de6.tar.gz samba-a8c6dd54381412201051fdc78f13e60ec9c47de6.tar.bz2 samba-a8c6dd54381412201051fdc78f13e60ec9c47de6.zip | |
join.py: Correct ctx.forestdns_zone and so remove the need for duplicate repl.replicate() call
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
| -rw-r--r-- | python/samba/join.py | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/python/samba/join.py b/python/samba/join.py index 637ade2b3c..2576a8b966 100644 --- a/python/samba/join.py +++ b/python/samba/join.py @@ -119,7 +119,7 @@ class dc_join(object): ctx.dnsdomain = ctx.samdb.domain_dns_name() ctx.dnsforest = ctx.samdb.forest_dns_name() 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, attrs=[], @@ -830,10 +830,6 @@ class dc_join(object): destination_dsa_guid, rodc=ctx.RODC, 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 # (those under CN=Partions,DC=...) # in order to indicate that we hold a replica for this NC |