From 9952eda7a1923971f77f3183cfa4c505386b30ee Mon Sep 17 00:00:00 2001 From: Garming Sam Date: Wed, 14 Feb 2018 13:32:33 +1300 Subject: [PATCH] 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 Reviewed-by: Andrew Bartlett Autobuild-User(master): Garming Sam Autobuild-Date(master): Thu Feb 15 10:18:42 CET 2018 on sn-devel-144 --- selftest/knownfail.d/rodc_repl | 1 - source4/dsdb/samdb/ldb_modules/repl_meta_data.c | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) delete mode 100644 selftest/knownfail.d/rodc_repl diff --git a/selftest/knownfail.d/rodc_repl b/selftest/knownfail.d/rodc_repl deleted file mode 100644 index bd5c04ea2cc9..000000000000 --- a/selftest/knownfail.d/rodc_repl +++ /dev/null @@ -1 +0,0 @@ -^samba4.drs.replica_sync_rodc.python.rodc..replica_sync_rodc.DrsReplicaSyncTestCase.test_ReplConflictsRODCRename.rodc diff --git a/source4/dsdb/samdb/ldb_modules/repl_meta_data.c b/source4/dsdb/samdb/ldb_modules/repl_meta_data.c index 84d898af4833..ead0bd9235be 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; } -- 2.34.1