diff options
| author | Garming Sam <garming@catalyst.net.nz> | 2018-02-14 13:32:33 +1300 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2018-02-27 16:00:15 +0100 |
| commit | 633df988d681fca58d60a3f9b0621efb52e73f7e (patch) | |
| tree | 500088821919d845107c55a919e58476fb939f0d /source4/dsdb | |
| parent | 1765edc7d616a2c3f94be78ce00b384ab4405f2f (diff) | |
| download | samba-633df988d681fca58d60a3f9b0621efb52e73f7e.tar.gz | |
repl_metadata: Avoid silent skipping an object during DRS (due to RODC rename collisions)
No error code was being set in this case, and so, we would commit the
HWM and UDV without actually having all the updates.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=13269
Signed-off-by: Garming Sam <garming@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Autobuild-User(master): Garming Sam <garming@samba.org>
Autobuild-Date(master): Thu Feb 15 10:18:42 CET 2018 on sn-devel-144
(cherry picked from commit 9952eda7a1923971f77f3183cfa4c505386b30ee)
Diffstat (limited to 'source4/dsdb')
| -rw-r--r-- | source4/dsdb/samdb/ldb_modules/repl_meta_data.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/source4/dsdb/samdb/ldb_modules/repl_meta_data.c b/source4/dsdb/samdb/ldb_modules/repl_meta_data.c index 84d898af483..ead0bd9235b 100644 --- a/source4/dsdb/samdb/ldb_modules/repl_meta_data.c +++ b/source4/dsdb/samdb/ldb_modules/repl_meta_data.c @@ -5571,6 +5571,7 @@ static int replmd_replicated_handle_rename(struct replmd_replicated_request *ar, "Conflict adding object '%s' from incoming replication but we are read only for the partition. \n" " - We must fail the operation until a master for this partition resolves the conflict", ldb_dn_get_linearized(conflict_dn)); + ret = LDB_ERR_OPERATIONS_ERROR; goto failed; } |