ITS#7581 more for prev commit

This commit is contained in:
Howard Chu 2013-05-23 11:45:05 -07:00
parent 82d7e9d8ab
commit 3d5e7ef0d2
2 changed files with 3 additions and 3 deletions

View File

@ -248,7 +248,7 @@ int bdb_entry_release(
/* slapMode : SLAP_SERVER_MODE, SLAP_TOOL_MODE, /* slapMode : SLAP_SERVER_MODE, SLAP_TOOL_MODE,
SLAP_TRUNCATE_MODE, SLAP_UNDEFINED_MODE */ SLAP_TRUNCATE_MODE, SLAP_UNDEFINED_MODE */
if ( slapMode == SLAP_SERVER_MODE ) { if ( slapMode & SLAP_SERVER_MODE ) {
/* If not in our cache, just free it */ /* If not in our cache, just free it */
if ( !e->e_private ) { if ( !e->e_private ) {
#ifdef SLAP_ZONE_ALLOC #ifdef SLAP_ZONE_ALLOC
@ -410,7 +410,7 @@ return_results:
bdb_cache_return_entry_rw(bdb, e, rw, &lock); bdb_cache_return_entry_rw(bdb, e, rw, &lock);
} else { } else {
if ( slapMode == SLAP_SERVER_MODE ) { if ( slapMode & SLAP_SERVER_MODE ) {
*ent = e; *ent = e;
/* big drag. we need a place to store a read lock so we can /* big drag. we need a place to store a read lock so we can
* release it later?? If we're in a txn, nothing is needed * release it later?? If we're in a txn, nothing is needed

View File

@ -271,7 +271,7 @@ int mdb_entry_release(
SLAP_TRUNCATE_MODE, SLAP_UNDEFINED_MODE */ SLAP_TRUNCATE_MODE, SLAP_UNDEFINED_MODE */
mdb_entry_return( op, e ); mdb_entry_return( op, e );
if ( slapMode == SLAP_SERVER_MODE ) { if ( slapMode & SLAP_SERVER_MODE ) {
OpExtra *oex; OpExtra *oex;
LDAP_SLIST_FOREACH( oex, &op->o_extra, oe_next ) { LDAP_SLIST_FOREACH( oex, &op->o_extra, oe_next ) {
if ( oex->oe_key == mdb ) { if ( oex->oe_key == mdb ) {