From 105a5b09f2160fb2092e4eb4a2960f1a9bfc93c4 Mon Sep 17 00:00:00 2001 From: Douglas Bagnall Date: Wed, 14 Feb 2018 17:15:07 +1300 Subject: repl_md: avoid returning LDB_SUCCESS on failure BUG: https://bugzilla.samba.org/show_bug.cgi?id=13269 Signed-off-by: Douglas Bagnall Signed-off-by: Garming Sam Reviewed-by: Andrew Bartlett (cherry picked from commit bc56913271e9d3a30143ef5a45d32430766d9dc3) Autobuild-User(v4-8-test): Stefan Metzmacher Autobuild-Date(v4-8-test): Tue Feb 27 20:59:28 CET 2018 on sn-devel-144 --- source4/dsdb/samdb/ldb_modules/repl_meta_data.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'source4') diff --git a/source4/dsdb/samdb/ldb_modules/repl_meta_data.c b/source4/dsdb/samdb/ldb_modules/repl_meta_data.c index ead0bd9235b..62f58addfde 100644 --- a/source4/dsdb/samdb/ldb_modules/repl_meta_data.c +++ b/source4/dsdb/samdb/ldb_modules/repl_meta_data.c @@ -5109,6 +5109,9 @@ failed: * replication will stop with an error, but there is not much * else we can do. */ + if (ret == LDB_SUCCESS) { + ret = LDB_ERR_OPERATIONS_ERROR; + } return ldb_module_done(ar->req, NULL, NULL, ret); } @@ -5719,8 +5722,10 @@ static int replmd_replicated_handle_rename(struct replmd_replicated_request *ar, ldb_errstring(ldb_module_get_ctx(ar->module)))); goto failed; } -failed: + talloc_free(tmp_ctx); + return ret; +failed: /* * On failure make the caller get the error * This means replication will stop with an error, @@ -5728,6 +5733,9 @@ failed: * LDB_ERR_ENTRY_ALREADY_EXISTS case this is exactly what is * needed. */ + if (ret == LDB_SUCCESS) { + ret = LDB_ERR_OPERATIONS_ERROR; + } talloc_free(tmp_ctx); return ret; -- cgit v1.2.1