diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2013-05-16 17:51:56 +1000 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2013-05-28 18:11:00 +0200 |
| commit | 277831eaf140c06bb25a3549434bc4acd4f533ec (patch) | |
| tree | a758b5ef535b74e9a858987641132f2000b20611 | |
| parent | 2d38009852487ab3572b66817ed0492333b5ec7d (diff) | |
| download | samba-277831eaf140c06bb25a3549434bc4acd4f533ec.tar.gz samba-277831eaf140c06bb25a3549434bc4acd4f533ec.tar.bz2 samba-277831eaf140c06bb25a3549434bc4acd4f533ec.zip | |
dsdb-repl_meta_data: Move TODO comment about conflicts and missing parents
Reviewed-by: Stefan Metzmacher <metze@samba.org>
Autobuild-User(master): Stefan Metzmacher <metze@samba.org>
Autobuild-Date(master): Tue May 28 18:11:00 CEST 2013 on sn-devel-104
| -rw-r--r-- | source4/dsdb/samdb/ldb_modules/repl_meta_data.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/source4/dsdb/samdb/ldb_modules/repl_meta_data.c b/source4/dsdb/samdb/ldb_modules/repl_meta_data.c index 5fc71ab1d2..98e60d7a8b 100644 --- a/source4/dsdb/samdb/ldb_modules/repl_meta_data.c +++ b/source4/dsdb/samdb/ldb_modules/repl_meta_data.c @@ -3658,15 +3658,6 @@ static int replmd_replicated_apply_add(struct replmd_replicated_request *ar) int ret; bool remote_isDeleted = false; - /* - * TODO: check if the parent object exist - */ - - /* - * TODO: handle the conflict case where an object with the - * same name exist - */ - ldb = ldb_module_get_ctx(ar->module); msg = ar->objs->objects[ar->index_current].msg; md = ar->objs->objects[ar->index_current].meta_data; @@ -3789,6 +3780,10 @@ static int replmd_replicated_apply_search_for_parent_callback(struct ldb_request } if (ares->error != LDB_SUCCESS && ares->error != LDB_ERR_NO_SUCH_OBJECT) { + /* + * TODO: deal with the above error that the parent object doesn't exist + */ + return ldb_module_done(ar->req, ares->controls, ares->response, ares->error); } |