From 82b56e63b5cb7e19a580a7cdeaf1caa8608852bc Mon Sep 17 00:00:00 2001 From: Tim Beale Date: Thu, 28 Sep 2017 09:42:14 +1300 Subject: replmd: Handle single-valued conflicts for an existing link Currently the code only handles the case where the received link attribute is a new link (i.e. pdn == NULL). As well as this, we need to handle the case where the conflicting link already exists, i.e. it's a deleted link that has been re-added on another DC. BUG: https://bugzilla.samba.org/show_bug.cgi?id=13055 Signed-off-by: Tim Beale Reviewed-by: Garming Sam Reviewed-by: Andrew Bartlett --- source4/torture/drs/python/link_conflicts.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'source4/torture/drs') diff --git a/source4/torture/drs/python/link_conflicts.py b/source4/torture/drs/python/link_conflicts.py index 036472bb9ea..c8b65563ad6 100644 --- a/source4/torture/drs/python/link_conflicts.py +++ b/source4/torture/drs/python/link_conflicts.py @@ -668,11 +668,8 @@ class DrsReplicaLinkConflictTestCase(drs_base.DrsBaseTestCase): self.ensure_unique_timestamp() self.add_link_attr(self.ldb_dc2, src_ou, "managedBy", target2_ou) - # try to sync the 2 DCs (this currently fails) - try: - self.sync_DCs(sync_order=sync_order) - except Exception, e: - self.fail("Replication could not resolve link conflict: %s" % e) + # try to sync the 2 DCs + self.sync_DCs(sync_order=sync_order) res1 = self.ldb_dc1.search(base="" % src_guid, scope=SCOPE_BASE, attrs=["managedBy"]) -- cgit v1.2.1