From 512ea17983e7cca78778d493c75b4401a438dfbb Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Fri, 6 Dec 2019 17:55:13 +1300 Subject: [PATCH] repl_meta_data: Add comment explaining what is being renamed after the conflict is resolved Signed-off-by: Andrew Bartlett --- source4/dsdb/samdb/ldb_modules/repl_meta_data.c | 5 ++++- 1 file changed, 4 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 d7a157a8e9b..3daac119741 100644 --- a/source4/dsdb/samdb/ldb_modules/repl_meta_data.c +++ b/source4/dsdb/samdb/ldb_modules/repl_meta_data.c @@ -6007,7 +6007,10 @@ static int replmd_replicated_handle_rename(struct replmd_replicated_request *ar, ldb_dn_get_linearized(ar->search_msg->dn), ldb_dn_get_linearized(msg->dn))); - + /* + * With the other record out of the way, do the rename we had + * at the top again + */ ret = dsdb_module_rename(ar->module, ar->search_msg->dn, msg->dn, DSDB_FLAG_NEXT_MODULE, ar->req); if (ret != LDB_SUCCESS) { -- 2.34.1