]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
repl_meta_data: Add comment explaining what is being renamed after the conflict is...
authorAndrew Bartlett <abartlet@samba.org>
Fri, 6 Dec 2019 04:55:13 +0000 (17:55 +1300)
committerKarolin Seeger <kseeger@samba.org>
Tue, 21 Jan 2020 10:11:39 +0000 (10:11 +0000)
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
source4/dsdb/samdb/ldb_modules/repl_meta_data.c

index d7a157a8e9b59c8a6ad86fc42e4668cefe3918ff..3daac119741f7fd8d23e0170b8a36c7ea1c9ec62 100644 (file)
@@ -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) {