about patch ed564fb04

[Matthieu Patou]

Hello Metze,

I had a look at this patch:

https://gitweb.samba.org/?p=metze/samba/wip.git;a=commitdiff;h=ed564fb0440b06dfb9f7420568593fb3833a0a52

I don't see anything wrong, but I think that was you are doing for the 
replmd_replicated_apply_merge function is overkill all the comparison 
with old parameters. If the recycle bin is not enabled then we can meet 
only once the case when another DC is replicating to us with the 
isDeleted attribute set: when the object is known by us and the other DC 
is notifying us that this object is now a tombstone, if the recycle-bin 
is enabled then we don't care because it's not a good idea to add 
isRecycled while replicating an object.

Concerning this patch you are right:
https://gitweb.samba.org/?p=metze/samba/wip.git;a=blobdiff;f=source4/dsdb/samdb/ldb_modules/repl_meta_data.c;h=a198afcb00dac53895fcf05fafa43bb4546a0e3e;hp=2ba77ec17b274f00b924970442c55227d107ea22;hb=834868d58db51a95d6f81d19856ba3bed23be4ff;hpb=4b6b400f52044de387ac5083dcd7490cd2a94907

But I don't understand your commit message.

Matthieu.

-- 
Matthieu Patou
Samba Team
http://samba.org