#47897 Need to move slapi_pblock_set(pb, SLAPI_MODRDN_EXISTING_ENTRY, original_entry->ep_entry) prior to original_entry overwritten
Closed: wontfix None Opened 7 years ago by nhosoi.

Similar issue to https://fedorahosted.org/389/ticket/47889

SLAPI_MODRDN_EXISTING_ENTRY in ldbm_back_modrdn needs to be set prior to the line that assigns a new copy to prepare for the next loop.

diff --git a/ldap/servers/slapd/back-ldbm/ldbm_modrdn.c b/ldap/servers/slapd/back-ldbm/ldbm_modrdn.c
index 7bcbcee..42e1fbf 100644
--- a/ldap/servers/slapd/back-ldbm/ldbm_modrdn.c
+++ b/ldap/servers/slapd/back-ldbm/ldbm_modrdn.c
@@ -295,10 +295,10 @@ ldbm_back_modrdn( Slapi_PBlock *pb )
                 slapi_entry_free(ent);
                 slapi_pblock_set( pb, SLAPI_MODRDN_EXISTING_ENTRY, NULL );
             }
+            slapi_pblock_set( pb, SLAPI_MODRDN_EXISTING_ENTRY, original_entry->ep_entry );
             ec = original_entry;
             original_entry = tmpentry;
             tmpentry = NULL;
-            slapi_pblock_set( pb, SLAPI_MODRDN_EXISTING_ENTRY, original_entry->ep_entry );
             free_modrdn_existing_entry = 0; /* owned by original_entry now */
             if (!cache_is_in_cache(&inst->inst_cache, ec)) {
                 /* Put the resetted entry 'ec' into the cache again. */

Hello Noriko,

The fix is good for me.

Just a quick question, is the purpose of the fix to have the same entry pointer in 'ec' and in pb[SLAPI_MODRDN_EXISTING_ENTRY].

thanks
theirry

Hi Thierry,

Replying to [comment:4 tbordaz]:

Hello Noriko,

The fix is good for me.

Just a quick question, is the purpose of the fix to have the same entry pointer in 'ec' and in pb[SLAPI_MODRDN_EXISTING_ENTRY].

Yes, that's correct. The slapi_pblock_set is supposed to set the current 'ec' the ldbm_back_modrdn is working on...
Thanks for your review, Thierry!
--noriko

Reviewed by Thierry (Thank you!!)

Pushed to master:
c7a78f4..07c1bc2 master -> master
commit 2aabb01

Pushed to 389-ds-base-1.3.3:
90939dc..c6b397c 389-ds-base-1.3.3 -> 389-ds-base-1.3.3
commit 2393a48

Pushed to 389-ds-base-1.3.2:
78feffc..7b39456 389-ds-base-1.3.2 -> 389-ds-base-1.3.2
commit 69b510d

Metadata Update from @tbordaz:
- Issue assigned to nhosoi
- Issue set to the milestone: 1.3.2.24

4 years ago

389-ds-base is moving from Pagure to Github. This means that new issues and pull requests
will be accepted only in 389-ds-base's github repository.

This issue has been cloned to Github and is available here:
- https://github.com/389ds/389-ds-base/issues/1228

If you want to receive further updates on the issue, please navigate to the github issue
and click on subscribe button.

Thank you for understanding. We apologize for all inconvenience.

Metadata Update from @spichugi:
- Issue close_status updated to: wontfix (was: Fixed)

a year ago

Login to comment on this ticket.

Metadata