diff options
| author | Douglas Bagnall <douglas.bagnall@catalyst.net.nz> | 2018-02-14 17:15:07 +1300 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2018-02-27 20:59:27 +0100 |
| commit | 105a5b09f2160fb2092e4eb4a2960f1a9bfc93c4 (patch) | |
| tree | 5f5e5abe48394a4c0c1b6f3f40546555e9a755de /source4/dsdb | |
| parent | 633df988d681fca58d60a3f9b0621efb52e73f7e (diff) | |
| download | samba-105a5b09f2160fb2092e4eb4a2960f1a9bfc93c4.tar.gz | |
repl_md: avoid returning LDB_SUCCESS on failure
BUG: https://bugzilla.samba.org/show_bug.cgi?id=13269
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>
(cherry picked from commit bc56913271e9d3a30143ef5a45d32430766d9dc3)
Autobuild-User(v4-8-test): Stefan Metzmacher <metze@samba.org>
Autobuild-Date(v4-8-test): Tue Feb 27 20:59:28 CET 2018 on sn-devel-144
Diffstat (limited to 'source4/dsdb')
| -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; |