replmd: Handle single-valued conflicts for an existing link
authorTim Beale <timbeale@catalyst.net.nz>
Wed, 27 Sep 2017 20:42:14 +0000 (09:42 +1300)
committerAndrew Bartlett <abartlet@samba.org>
Fri, 20 Oct 2017 02:05:21 +0000 (04:05 +0200)
commit82b56e63b5cb7e19a580a7cdeaf1caa8608852bc
tree49dae49fbe814adbe9db3deda900c00b5fa9e961
parentf36b2bb126ccdc9a68b3b51b999f59090c7d8b82
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 <timbeale@catalyst.net.nz>
Reviewed-by: Garming Sam <garming@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
selftest/knownfail.d/link_conflicts [deleted file]
source4/dsdb/samdb/ldb_modules/repl_meta_data.c
source4/torture/drs/python/link_conflicts.py