Commit da72dab3 authored by Quanah Gibson-Mount's avatar Quanah Gibson-Mount
Browse files

ITS#5332

parent e112b832
...@@ -28,6 +28,7 @@ OpenLDAP 2.4.8 Engineering ...@@ -28,6 +28,7 @@ OpenLDAP 2.4.8 Engineering
Fixed slapd-bdb crash with modrdn (ITS#5358) Fixed slapd-bdb crash with modrdn (ITS#5358)
Fixed slapd-bdb segv with bdb4.6 (ITS#5322) Fixed slapd-bdb segv with bdb4.6 (ITS#5322)
Fixed slapd-bdb modrdn to same dn (ITS#5319) Fixed slapd-bdb modrdn to same dn (ITS#5319)
Fixed slapd-bdb MMR (ITS#5332)
Added slapd-bdb/slapd-hdb DB encryption (ITS#5359) Added slapd-bdb/slapd-hdb DB encryption (ITS#5359)
Fixed slapd-ldif delete (ITS#5265) Fixed slapd-ldif delete (ITS#5265)
Fixed slapd-meta link to slapd-ldap (ITS#5355) Fixed slapd-meta link to slapd-ldap (ITS#5355)
......
...@@ -251,15 +251,17 @@ bdb_cache_return_entry_rw( struct bdb_info *bdb, Entry *e, ...@@ -251,15 +251,17 @@ bdb_cache_return_entry_rw( struct bdb_info *bdb, Entry *e,
EntryInfo *ei; EntryInfo *ei;
int free = 0; int free = 0;
bdb_cache_entry_db_unlock( bdb, lock );
ei = e->e_private; ei = e->e_private;
bdb_cache_entryinfo_lock( ei ); bdb_cache_entry_db_unlock( bdb, lock );
if ( ei->bei_state & CACHE_ENTRY_NOT_CACHED ) { if ( ei ) {
ei->bei_e = NULL; bdb_cache_entryinfo_lock( ei );
ei->bei_state ^= CACHE_ENTRY_NOT_CACHED; if ( ei->bei_state & CACHE_ENTRY_NOT_CACHED ) {
free = 1; ei->bei_e = NULL;
ei->bei_state ^= CACHE_ENTRY_NOT_CACHED;
free = 1;
}
bdb_cache_entryinfo_unlock( ei );
} }
bdb_cache_entryinfo_unlock( ei );
if ( free ) { if ( free ) {
e->e_private = NULL; e->e_private = NULL;
bdb_entry_return( e ); bdb_entry_return( e );
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment