[PATCH] Handle (some) conflicts during replication of renames

[Andrew Bartlett]

This patch hopefully allows us to recover from having a conflict due to
rename.

It doesn't handle all the conflicts (only if the incoming name is
newer), but it at least should allow recovery with 'samba-tool drs
replicate x y NC --local --full-sync'.

I've not been able to test it on the corrupt db yet (been working with a
user on why replication stopped for them), but I wanted to put it out to
the list for review, as this is complex code and difficult to test.

Thanks,

Andrew Bartlett
-- 
Andrew Bartlett                                http://samba.org/~abartlet/
Authentication Developer, Samba Team           http://samba.org
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0001-s4-dsdb-Provide-a-way-to-handle-conflicts-due-to-ren.patch
Type: text/x-patch
Size: 7457 bytes
Desc: not available
URL: <http://lists.samba.org/pipermail/samba-technical/attachments/20120608/fcf20d01/attachment.bin>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0002-s4-dsdb-Provide-a-way-to-force-incoming-renames-to-t.patch
Type: text/x-patch
Size: 1800 bytes
Desc: not available
URL: <http://lists.samba.org/pipermail/samba-technical/attachments/20120608/fcf20d01/attachment-0001.bin>