diff options
| author | Garming Sam <garming@catalyst.net.nz> | 2018-02-14 13:32:24 +1300 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2018-02-27 16:00:15 +0100 |
| commit | 1765edc7d616a2c3f94be78ce00b384ab4405f2f (patch) | |
| tree | a80094626165bd2f42da97d4e2e77182e3c317c9 /source4/dsdb | |
| parent | c57f17b0b8f7fbbd955ba7f917ee726ca4869fd6 (diff) | |
| download | samba-1765edc7d616a2c3f94be78ce00b384ab4405f2f.tar.gz | |
repl_metadata: Avoid silent skipping an object during DRS (due to RODC name 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>
(cherry picked from commit 59fa9e7ecf84bd4c2469e9a6835855769c4f6287)
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 7646f942fca..84d898af483 100644 --- a/source4/dsdb/samdb/ldb_modules/repl_meta_data.c +++ b/source4/dsdb/samdb/ldb_modules/repl_meta_data.c @@ -4932,6 +4932,7 @@ static int replmd_op_possible_conflict_callback(struct ldb_request *req, struct "Conflict adding object '%s' from incoming replication as 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; } |