From d9630e9360c5b664a6fb15b95e9a90f0411b047f Mon Sep 17 00:00:00 2001
From: Howard Chu <hyc@openldap.org>
Date: Thu, 23 May 2013 11:45:05 -0700
Subject: [PATCH] ITS#7581 more for prev commit
---
servers/slapd/back-bdb/id2entry.c | 4 ++--
servers/slapd/back-mdb/id2entry.c | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/servers/slapd/back-bdb/id2entry.c b/servers/slapd/back-bdb/id2entry.c
index 2801877fc7..03c142ea1c 100644
--- a/servers/slapd/back-bdb/id2entry.c
+++ b/servers/slapd/back-bdb/id2entry.c
@@ -248,7 +248,7 @@ int bdb_entry_release(
/* slapMode : SLAP_SERVER_MODE, SLAP_TOOL_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 ( !e->e_private ) {
#ifdef SLAP_ZONE_ALLOC
@@ -410,7 +410,7 @@ return_results:
bdb_cache_return_entry_rw(bdb, e, rw, &lock);
} else {
- if ( slapMode == SLAP_SERVER_MODE ) {
+ if ( slapMode & SLAP_SERVER_MODE ) {
*ent = e;
/* 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
diff --git a/servers/slapd/back-mdb/id2entry.c b/servers/slapd/back-mdb/id2entry.c
index d3d238f353..84de09d125 100644
--- a/servers/slapd/back-mdb/id2entry.c
+++ b/servers/slapd/back-mdb/id2entry.c
@@ -271,7 +271,7 @@ int mdb_entry_release(
SLAP_TRUNCATE_MODE, SLAP_UNDEFINED_MODE */
mdb_entry_return( op, e );
- if ( slapMode == SLAP_SERVER_MODE ) {
+ if ( slapMode & SLAP_SERVER_MODE ) {
OpExtra *oex;
LDAP_SLIST_FOREACH( oex, &op->o_extra, oe_next ) {
if ( oex->oe_key == mdb ) {
--
GitLab