upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-12-23 16:19:35 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

ITS#4616 fix cache_modrdn bei_state management

Browse source
This commit is contained in:
Howard Chu 2006-07-18 10:22:48 +00:00
parent 4ccf65d9bc
commit 0340a1f1bf
1 changed files with 13 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
servers/slapd/back-bdb/cache.c
View file

@ -1016,6 +1016,10 @@ bdb_cache_modrdn(
avl_delete( &pei->bei_kids, (caddr_t) ei, bdb_rdn_cmp ); avl_delete( &pei->bei_kids, (caddr_t) ei, bdb_rdn_cmp );
free( ei->bei_nrdn.bv_val ); free( ei->bei_nrdn.bv_val );
ber_dupbv( &ei->bei_nrdn, nrdn ); ber_dupbv( &ei->bei_nrdn, nrdn );
if ( !pei->bei_kids )
pei->bei_state |= CACHE_ENTRY_NO_KIDS | CACHE_ENTRY_NO_GRANDKIDS;
#ifdef BDB_HIER #ifdef BDB_HIER
free( ei->bei_rdn.bv_val ); free( ei->bei_rdn.bv_val );
@ -1035,7 +1039,16 @@ bdb_cache_modrdn(
bdb_cache_entryinfo_unlock( pei ); bdb_cache_entryinfo_unlock( pei );
bdb_cache_entryinfo_lock( ein ); bdb_cache_entryinfo_lock( ein );
} }
/* parent now has kids */
if ( ein->bei_state & CACHE_ENTRY_NO_KIDS )
ein->bei_state ^= CACHE_ENTRY_NO_KIDS;
#ifdef BDB_HIER #ifdef BDB_HIER
/* parent might now have grandkids */
if ( ein->bei_state & CACHE_ENTRY_NO_GRANDKIDS &&
!(ei->bei_state & (CACHE_ENTRY_NO_KIDS)))
ein->bei_state ^= CACHE_ENTRY_NO_GRANDKIDS;
{ {
/* Record the generation number of this change */ /* Record the generation number of this change */
ldap_pvt_thread_mutex_lock( &bdb->bi_modrdns_mutex ); ldap_pvt_thread_mutex_lock( &bdb->bi_modrdns_mutex );