upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-12-27 18:19:52 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

lookup entry id when equality on entryDN (ITS#5791; fixes previous commit)

Browse source
This commit is contained in:
Pierangelo Masarati 2008-11-04 12:16:23 +00:00
parent 45aaaddb16
commit c41df6ed07
1 changed files with 7 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
servers/slapd/back-bdb/filterindex.c
View file

@ -697,28 +697,6 @@ done:
return rc;
}
static int
dn_equality_candidate(
Operation *op,
DB_TXN *rtxn,
struct berval *ndn,
ID *ids )
{
struct bdb_info *bdb = (struct bdb_info *) op->o_bd->be_private;
EntryInfo ei = { 0 };
DB_LOCK lock;
int rc;
lock.mode = DB_LOCK_NG;
rc = bdb_dn2id( op, ndn, &ei, rtxn, &lock );
if ( rc == 0 ) {
BDB_IDL_RANGE( ids, ei.bei_id, ei.bei_id );
bdb_cache_entry_db_unlock( bdb, &lock );
}
return rc;
}
static int
equality_candidates(
Operation *op,
@ -740,7 +718,13 @@ equality_candidates(
ava->aa_desc->ad_cname.bv_val, 0, 0 );
if ( ava->aa_desc == slap_schema.si_ad_entryDN ) {
return dn_equality_candidate( op, rtxn, &ava->aa_value, ids );
EntryInfo *ei = NULL;
rc = bdb_cache_find_ndn( op, rtxn, &ava->aa_value, &ei );
if ( rc == LDAP_SUCCESS )
bdb_idl_insert( ids, ei->bei_id );
if ( ei )
bdb_cache_entryinfo_unlock( ei );
return rc;
}
BDB_IDL_ALL( bdb, ids );