diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2019-12-06 17:55:13 +1300 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2020-01-21 10:11:39 +0000 |
| commit | 512ea17983e7cca78778d493c75b4401a438dfbb (patch) | |
| tree | 286b85e6d4f323f6ed9eea69a9d2c4d2c3681961 /source4 | |
| parent | 2b1828276b365a30131ac6ea543ac344941b8088 (diff) | |
| download | samba-512ea17983e7cca78778d493c75b4401a438dfbb.tar.gz | |
repl_meta_data: Add comment explaining what is being renamed after the conflict is resolved
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Diffstat (limited to 'source4')
| -rw-r--r-- | source4/dsdb/samdb/ldb_modules/repl_meta_data.c | 5 |
1 files changed, 4 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 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) { |