X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-bdb%2Fid2entry.c;h=696bfd7d53788cfea987abef39135e29819f15b1;hb=9b5972dc9e14e1f7a7bef755bfd0dc61bcf1ffb3;hp=2801877fc729fa403218c19c5feb4c0ae7cf118c;hpb=2c264be2c2eaae1c15d947373543ab0e4a7058d9;p=openldap diff --git a/servers/slapd/back-bdb/id2entry.c b/servers/slapd/back-bdb/id2entry.c index 2801877fc7..696bfd7d53 100644 --- 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 . * - * Copyright 2000-2013 The OpenLDAP Foundation. + * Copyright 2000-2016 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