diff options
| author | Douglas Bagnall <douglas.bagnall@catalyst.net.nz> | 2018-02-14 17:15:07 +1300 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2018-02-24 10:54:07 +0100 |
| commit | bc56913271e9d3a30143ef5a45d32430766d9dc3 (patch) | |
| tree | c130ec261da9fa4b477d73c9acc136744f40ff93 /source4 | |
| parent | 6368af8260ec7dd74349eabb48d1312385e0ad49 (diff) | |
| download | samba-bc56913271e9d3a30143ef5a45d32430766d9dc3.tar.gz | |
repl_md: avoid returning LDB_SUCCESS on failure
Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Signed-off-by: Garming Sam <garming@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Diffstat (limited to 'source4')
| -rw-r--r-- | source4/dsdb/samdb/ldb_modules/repl_meta_data.c | 10 |
1 files changed, 9 insertions, 1 deletions
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; |