From ad8c1db01355c766d4d29c6073a9895ceafd066e Mon Sep 17 00:00:00 2001 From: Douglas Bagnall Date: Wed, 14 Feb 2018 17:15:07 +1300 Subject: [PATCH] repl_md: avoid returning LDB_SUCCESS on failure Signed-off-by: Douglas Bagnall Signed-off-by: Garming Sam --- source4/dsdb/samdb/ldb_modules/repl_meta_data.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/source4/dsdb/samdb/ldb_modules/repl_meta_data.c b/source4/dsdb/samdb/ldb_modules/repl_meta_data.c index 7646f942fca..1f5fe9a7090 100644 --- a/source4/dsdb/samdb/ldb_modules/repl_meta_data.c +++ b/source4/dsdb/samdb/ldb_modules/repl_meta_data.c @@ -5108,6 +5108,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); } @@ -5717,8 +5720,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, @@ -5726,6 +5731,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; -- 2.14.1