static int presence_candidates(
Operation *op,
- u_int32_t locker,
+ BDB_LOCKER locker,
AttributeDescription *desc,
ID *ids );
static int equality_candidates(
Operation *op,
- u_int32_t locker,
+ BDB_LOCKER locker,
AttributeAssertion *ava,
ID *ids,
ID *tmp );
static int inequality_candidates(
Operation *op,
- u_int32_t locker,
+ BDB_LOCKER locker,
AttributeAssertion *ava,
ID *ids,
ID *tmp,
int gtorlt );
static int approx_candidates(
Operation *op,
- u_int32_t locker,
+ BDB_LOCKER locker,
AttributeAssertion *ava,
ID *ids,
ID *tmp );
static int substring_candidates(
Operation *op,
- u_int32_t locker,
+ BDB_LOCKER locker,
SubstringsAssertion *sub,
ID *ids,
ID *tmp );
static int list_candidates(
Operation *op,
- u_int32_t locker,
+ BDB_LOCKER locker,
Filter *flist,
int ftype,
ID *ids,
static int
ext_candidates(
Operation *op,
- u_int32_t locker,
+ BDB_LOCKER locker,
MatchingRuleAssertion *mra,
ID *ids,
ID *tmp,
static int
comp_candidates (
Operation *op,
- u_int32_t locker,
+ BDB_LOCKER locker,
MatchingRuleAssertion *mra,
ComponentFilter *f,
ID *ids,
static int
ava_comp_candidates (
Operation *op,
- u_int32_t locker,
+ BDB_LOCKER locker,
AttributeAssertion *ava,
AttributeAliasing *aa,
ID *ids,
int
bdb_filter_candidates(
Operation *op,
- u_int32_t locker,
+ BDB_LOCKER locker,
Filter *f,
ID *ids,
ID *tmp,
static int
comp_list_candidates(
Operation *op,
- u_int32_t locker,
+ BDB_LOCKER locker,
MatchingRuleAssertion* mra,
ComponentFilter *flist,
int ftype,
static int
comp_equality_candidates (
Operation *op,
- u_int32_t locker,
+ BDB_LOCKER locker,
MatchingRuleAssertion *mra,
ComponentAssertion *ca,
ID *ids,
rc = bdb_index_param( op->o_bd, mra->ma_desc, LDAP_FILTER_EQUALITY,
&db, &mask, &prefix );
- if ( db == NULL ) {
- return 0;
- }
-
if( rc != LDAP_SUCCESS ) {
return 0;
}
static int
ava_comp_candidates (
Operation *op,
- u_int32_t locker,
+ BDB_LOCKER locker,
AttributeAssertion *ava,
AttributeAliasing *aa,
ID *ids,
static int
comp_candidates (
Operation *op,
- u_int32_t locker,
+ BDB_LOCKER locker,
MatchingRuleAssertion *mra,
ComponentFilter *f,
ID *ids,
static int
ext_candidates(
Operation *op,
- u_int32_t locker,
+ BDB_LOCKER locker,
MatchingRuleAssertion *mra,
ID *ids,
ID *tmp,
BDB_IDL_ZERO( ids );
if ( mra->ma_rule == slap_schema.si_mr_distinguishedNameMatch ) {
ei = NULL;
- rc = bdb_cache_find_ndn( op, NULL, &mra->ma_value, &ei );
+ rc = bdb_cache_find_ndn( op, locker, &mra->ma_value, &ei );
if ( rc == LDAP_SUCCESS )
bdb_idl_insert( ids, ei->bei_id );
if ( ei )
struct berval pdn;
ei = NULL;
dnParent( &mra->ma_value, &pdn );
- bdb_cache_find_ndn( op, NULL, &pdn, &ei );
+ bdb_cache_find_ndn( op, locker, &pdn, &ei );
if ( ei ) {
bdb_cache_entryinfo_unlock( ei );
while ( ei && ei->bei_id ) {
scope = LDAP_SCOPE_BASE;
if ( scope > LDAP_SCOPE_BASE ) {
ei = NULL;
- rc = bdb_cache_find_ndn( op, NULL, &mra->ma_value, &ei );
+ rc = bdb_cache_find_ndn( op, locker, &mra->ma_value, &ei );
if ( ei )
bdb_cache_entryinfo_unlock( ei );
if ( rc == LDAP_SUCCESS ) {
op->ors_scope = scope;
rc = bdb_dn2idl( op, locker, &mra->ma_value, ei, ids,
stack );
+ op->ors_scope = sc;
}
return 0;
}
static int
list_candidates(
Operation *op,
- u_int32_t locker,
+ BDB_LOCKER locker,
Filter *flist,
int ftype,
ID *ids,
static int
presence_candidates(
Operation *op,
- u_int32_t locker,
+ BDB_LOCKER locker,
AttributeDescription *desc,
ID *ids )
{
rc = bdb_index_param( op->o_bd, desc, LDAP_FILTER_PRESENT,
&db, &mask, &prefix );
- if( db == NULL ) {
+ if( rc == LDAP_INAPPROPRIATE_MATCHING ) {
/* not indexed */
Debug( LDAP_DEBUG_TRACE,
"<= bdb_presence_candidates: (%s) not indexed\n",
static int
equality_candidates(
Operation *op,
- u_int32_t locker,
+ BDB_LOCKER locker,
AttributeAssertion *ava,
ID *ids,
ID *tmp )
rc = bdb_index_param( op->o_bd, ava->aa_desc, LDAP_FILTER_EQUALITY,
&db, &mask, &prefix );
- if ( db == NULL ) {
+ if ( rc == LDAP_INAPPROPRIATE_MATCHING ) {
Debug( LDAP_DEBUG_ANY,
"<= bdb_equality_candidates: (%s) not indexed\n",
ava->aa_desc->ad_cname.bv_val, 0, 0 );
static int
approx_candidates(
Operation *op,
- u_int32_t locker,
+ BDB_LOCKER locker,
AttributeAssertion *ava,
ID *ids,
ID *tmp )
rc = bdb_index_param( op->o_bd, ava->aa_desc, LDAP_FILTER_APPROX,
&db, &mask, &prefix );
- if ( db == NULL ) {
+ if ( rc == LDAP_INAPPROPRIATE_MATCHING ) {
Debug( LDAP_DEBUG_ANY,
"<= bdb_approx_candidates: (%s) not indexed\n",
ava->aa_desc->ad_cname.bv_val, 0, 0 );
static int
substring_candidates(
Operation *op,
- u_int32_t locker,
+ BDB_LOCKER locker,
SubstringsAssertion *sub,
ID *ids,
ID *tmp )
rc = bdb_index_param( op->o_bd, sub->sa_desc, LDAP_FILTER_SUBSTRINGS,
&db, &mask, &prefix );
- if ( db == NULL ) {
+ if ( rc == LDAP_INAPPROPRIATE_MATCHING ) {
Debug( LDAP_DEBUG_ANY,
"<= bdb_substring_candidates: (%s) not indexed\n",
sub->sa_desc->ad_cname.bv_val, 0, 0 );
static int
inequality_candidates(
Operation *op,
- u_int32_t locker,
+ BDB_LOCKER locker,
AttributeAssertion *ava,
ID *ids,
ID *tmp,
rc = bdb_index_param( op->o_bd, ava->aa_desc, LDAP_FILTER_EQUALITY,
&db, &mask, &prefix );
- if ( db == NULL ) {
+ if ( rc == LDAP_INAPPROPRIATE_MATCHING ) {
Debug( LDAP_DEBUG_ANY,
"<= bdb_inequality_candidates: (%s) not indexed\n",
ava->aa_desc->ad_cname.bv_val, 0, 0 );