Merge remote-tracking branch 'origin/mdb.RE/0.9' into OPENLDAP_REL_ENG_2_4

[openldap] / servers / slapd / back-bdb / id2entry.c

diff --git a/servers/slapd/back-bdb/id2entry.c b/servers/slapd/back-bdb/id2entry.c
index 2801877fc729fa403218c19c5feb4c0ae7cf118c..a5c53d6421278e2fd0e0920a450ddf90c66d218b 100644 (file)
--- a/servers/slapd/back-bdb/id2entry.c
+++ b/servers/slapd/back-bdb/id2entry.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 2000-2013 The OpenLDAP Foundation.
+ * Copyright 2000-2014 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -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