/* search.c - ldbm backend search function */
/* $OpenLDAP$ */
/*
- * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
* COPYING RESTRICTIONS APPLY, see COPYRIGHT file
*/
Backend *be,
Connection *conn,
Operation *op,
- const char *base,
- const char *nbase,
+ struct berval *base,
+ struct berval *nbase,
int scope,
int deref,
int slimit,
int tlimit,
Filter *filter,
- const char *filterstr,
- char **attrs,
- int attrsonly
-)
+ struct berval *filterstr,
+ AttributeName *attrs,
+ int attrsonly )
{
struct ldbminfo *li = (struct ldbminfo *) be->be_private;
int rc, err;
ID_BLOCK *candidates;
ID id, cursor;
Entry *e;
- struct berval **v2refs = NULL;
+ BerVarray v2refs = NULL;
Entry *matched = NULL;
- char *realbase = NULL;
+ struct berval realbase = { 0, NULL };
int nentries = 0;
int manageDSAit = get_manageDSAit( op );
+ int cscope = LDAP_SCOPE_DEFAULT;
+ struct slap_limits_set *limit = NULL;
+ int isroot = 0;
+
+#ifdef SLAP_X_FILTER_HASSUBORDINATES
+ int filter_hasSubordinates = 0;
+#endif /* SLAP_X_FILTER_HASSUBORDINATES */
+
+#ifdef NEW_LOGGING
+ LDAP_LOG( BACK_LDBM, ENTRY, "ldbm_back_search: enter\n", 0, 0, 0 );
+#else
Debug(LDAP_DEBUG_TRACE, "=> ldbm_back_search\n", 0, 0, 0);
+#endif
+
+ /* grab giant lock for reading */
+ ldap_pvt_thread_rdwr_rlock(&li->li_giant_rwlock);
+
+ if ( nbase->bv_len == 0 ) {
+ /* DIT root special case */
+ e = (Entry *) &slap_entry_root;
+
+ /* need normalized dn below */
+ ber_dupbv( &realbase, &e->e_nname );
+
+ candidates = search_candidates( be, e, filter,
+ scope, deref, manageDSAit );
- /* get entry with reader lock */
- if ( deref & LDAP_DEREF_FINDING ) {
+ goto searchit;
+
+ } else if ( deref & LDAP_DEREF_FINDING ) {
+ /* deref dn and get entry with reader lock */
e = deref_dn_r( be, nbase, &err, &matched, &text );
+ if( err == LDAP_NO_SUCH_OBJECT ) err = LDAP_REFERRAL;
+
} else {
+ /* get entry with reader lock */
e = dn2entry_r( be, nbase, &matched );
err = e != NULL ? LDAP_SUCCESS : LDAP_REFERRAL;
text = NULL;
}
if ( e == NULL ) {
- char *matched_dn = NULL;
- struct berval **refs = NULL;
+ struct berval matched_dn = { 0, NULL };
+ BerVarray refs = NULL;
if ( matched != NULL ) {
- matched_dn = ch_strdup( matched->e_dn );
+ BerVarray erefs;
+ ber_dupbv( &matched_dn, &matched->e_name );
- refs = is_entry_referral( matched )
+ erefs = is_entry_referral( matched )
? get_entry_referrals( be, conn, op, matched )
: NULL;
cache_return_entry_r( &li->li_cache, matched );
+
+ if( erefs ) {
+ refs = referral_rewrite( erefs, &matched_dn,
+ base, scope );
+
+ ber_bvarray_free( erefs );
+ }
+
} else {
- refs = default_referral;
+ refs = referral_rewrite( default_referral,
+ NULL, base, scope );
}
- send_ldap_result( conn, op, err,
- matched_dn, text, refs, NULL );
+ ldap_pvt_thread_rdwr_runlock(&li->li_giant_rwlock);
- if( matched != NULL ) {
- ber_bvecfree( refs );
- free( matched_dn );
- }
+ send_ldap_result( conn, op, err, matched_dn.bv_val,
+ text, refs, NULL );
+ ber_bvarray_free( refs );
+ ber_memfree( matched_dn.bv_val );
return 1;
}
if (!manageDSAit && is_entry_referral( e ) ) {
/* entry is a referral, don't allow add */
- char *matched_dn = ch_strdup( e->e_dn );
- struct berval **refs = get_entry_referrals( be,
- conn, op, e );
+ struct berval matched_dn;
+ BerVarray erefs;
+ BerVarray refs;
+
+ ber_dupbv( &matched_dn, &e->e_name );
+ erefs = get_entry_referrals( be, conn, op, e );
+ refs = NULL;
cache_return_entry_r( &li->li_cache, e );
+ ldap_pvt_thread_rdwr_runlock(&li->li_giant_rwlock);
- Debug( LDAP_DEBUG_TRACE, "entry is referral\n", 0,
- 0, 0 );
+#ifdef NEW_LOGGING
+ LDAP_LOG( BACK_LDBM, INFO,
+ "ldbm_search: entry (%s) is a referral.\n",
+ e->e_dn, 0, 0 );
+#else
+ Debug( LDAP_DEBUG_TRACE,
+ "ldbm_search: entry is referral\n",
+ 0, 0, 0 );
+#endif
- send_ldap_result( conn, op, LDAP_REFERRAL,
- matched_dn, NULL, refs, NULL );
+ if( erefs ) {
+ refs = referral_rewrite( erefs, &matched_dn,
+ base, scope );
- ber_bvecfree( refs );
- free( matched_dn );
+ ber_bvarray_free( erefs );
+ }
- return 1;
- }
+ if( refs ) {
+ send_ldap_result( conn, op, LDAP_REFERRAL,
+ matched_dn.bv_val, NULL, refs, NULL );
+ ber_bvarray_free( refs );
- if ( tlimit == 0 && be_isroot( be, op->o_ndn ) ) {
- tlimit = -1; /* allow root to set no limit */
- } else {
- tlimit = (tlimit > be->be_timelimit || tlimit < 1) ?
- be->be_timelimit : tlimit;
- stoptime = op->o_time + tlimit;
+ } else {
+ send_ldap_result( conn, op, LDAP_OTHER,
+ matched_dn.bv_val,
+ "bad referral object", NULL, NULL );
+ }
+
+ ber_memfree( matched_dn.bv_val );
+ return 1;
}
- if ( slimit == 0 && be_isroot( be, op->o_ndn ) ) {
- slimit = -1; /* allow root to set no limit */
- } else {
- slimit = (slimit > be->be_sizelimit || slimit < 1) ?
- be->be_sizelimit : slimit;
+ if ( is_entry_alias( e ) ) {
+ /* don't deref */
+ deref = LDAP_DEREF_NEVER;
}
if ( scope == LDAP_SCOPE_BASE ) {
+ cscope = LDAP_SCOPE_BASE;
candidates = base_candidate( be, e );
} else {
+ cscope = ( scope != LDAP_SCOPE_SUBTREE )
+ ? LDAP_SCOPE_BASE : LDAP_SCOPE_SUBTREE;
candidates = search_candidates( be, e, filter,
scope, deref, manageDSAit );
}
/* need normalized dn below */
- realbase = ch_strdup( e->e_ndn );
+ ber_dupbv( &realbase, &e->e_nname );
cache_return_entry_r( &li->li_cache, e );
+searchit:
if ( candidates == NULL ) {
/* no candidates */
- Debug( LDAP_DEBUG_TRACE, "no candidates\n", 0,
- 0, 0 );
+#ifdef NEW_LOGGING
+ LDAP_LOG( BACK_LDBM, INFO,
+ "ldbm_search: no candidates\n" , 0, 0, 0);
+#else
+ Debug( LDAP_DEBUG_TRACE, "ldbm_search: no candidates\n",
+ 0, 0, 0 );
+#endif
send_search_result( conn, op,
LDAP_SUCCESS,
goto done;
}
+ /* if not root, get appropriate limits */
+ if ( be_isroot( be, &op->o_ndn ) ) {
+ isroot = 1;
+ } else {
+ ( void ) get_limits( be, &op->o_ndn, &limit );
+ }
+
+ /* if candidates exceed to-be-checked entries, abort */
+ if ( !isroot && limit->lms_s_unchecked != -1 ) {
+ if ( ID_BLOCK_NIDS( candidates ) > (unsigned) limit->lms_s_unchecked ) {
+ send_search_result( conn, op, LDAP_ADMINLIMIT_EXCEEDED,
+ NULL, NULL, NULL, NULL, 0 );
+ rc = 0;
+ goto done;
+ }
+ }
+
+ /* if root an no specific limit is required, allow unlimited search */
+ if ( isroot ) {
+ if ( tlimit == 0 ) {
+ tlimit = -1;
+ }
+
+ if ( slimit == 0 ) {
+ slimit = -1;
+ }
+
+ } else {
+ /* if no limit is required, use soft limit */
+ if ( tlimit <= 0 ) {
+ tlimit = limit->lms_t_soft;
+
+ /* if requested limit higher than hard limit, abort */
+ } else if ( tlimit > limit->lms_t_hard ) {
+ /* no hard limit means use soft instead */
+ if ( limit->lms_t_hard == 0 && tlimit > limit->lms_t_soft ) {
+ tlimit = limit->lms_t_soft;
+
+ /* positive hard limit means abort */
+ } else if ( limit->lms_t_hard > 0 ) {
+ send_search_result( conn, op,
+ LDAP_UNWILLING_TO_PERFORM,
+ NULL, NULL, NULL, NULL, 0 );
+ rc = 0;
+ goto done;
+ }
+
+ /* negative hard limit means no limit */
+ }
+
+ /* if no limit is required, use soft limit */
+ if ( slimit <= 0 ) {
+ slimit = limit->lms_s_soft;
+
+ /* if requested limit higher than hard limit, abort */
+ } else if ( slimit > limit->lms_s_hard ) {
+ /* no hard limit means use soft instead */
+ if ( limit->lms_s_hard == 0 && slimit > limit->lms_s_soft ) {
+ slimit = limit->lms_s_soft;
+
+ /* positive hard limit means abort */
+ } else if ( limit->lms_s_hard > 0 ) {
+ send_search_result( conn, op,
+ LDAP_UNWILLING_TO_PERFORM,
+ NULL, NULL, NULL, NULL, 0 );
+ rc = 0;
+ goto done;
+ }
+
+ /* negative hard limit means no limit */
+ }
+ }
+
+ /* compute it anyway; root does not use it */
+ stoptime = op->o_time + tlimit;
+
+#ifdef SLAP_X_FILTER_HASSUBORDINATES
+ /*
+ * is hasSubordinates used in the filter ?
+ * FIXME: we may compute this directly when parsing the filter
+ */
+ filter_hasSubordinates = filter_has_subordinates( filter );
+#endif /* SLAP_X_FILTER_HASSUBORDINATES */
+
for ( id = idl_firstid( candidates, &cursor ); id != NOID;
id = idl_nextid( candidates, &cursor ) )
{
- int scopeok = 0;
+ int scopeok = 0;
+ int result = 0;
+#ifdef SLAP_X_FILTER_HASSUBORDINATES
+ Attribute *hasSubordinates = NULL;
+#endif /* SLAP_X_FILTER_HASSUBORDINATES */
/* check for abandon */
- ldap_pvt_thread_mutex_lock( &op->o_abandonmutex );
-
if ( op->o_abandon ) {
- ldap_pvt_thread_mutex_unlock( &op->o_abandonmutex );
rc = 0;
goto done;
}
- ldap_pvt_thread_mutex_unlock( &op->o_abandonmutex );
-
/* check time limit */
if ( tlimit != -1 && slap_get_time() > stoptime ) {
send_search_result( conn, op, LDAP_TIMELIMIT_EXCEEDED,
e = id2entry_r( be, id );
if ( e == NULL ) {
- Debug( LDAP_DEBUG_ARGS, "search: candidate %ld not found\n",
+#ifdef NEW_LOGGING
+ LDAP_LOG( BACK_LDBM, INFO,
+ "ldbm_search: candidate %ld not found.\n", id, 0, 0 );
+#else
+ Debug( LDAP_DEBUG_TRACE,
+ "ldbm_search: candidate %ld not found\n",
id, 0, 0 );
+#endif
goto loop_continue;
}
/* need to skip alias which deref into scope */
if( scope & LDAP_SCOPE_ONELEVEL ) {
- char *pdn = dn_parent( NULL, e->e_ndn );
- if ( pdn != NULL ) {
- if( strcmp( pdn, realbase ) ) {
- free( pdn );
- goto loop_continue;
- }
- free(pdn);
+ struct berval pdn;
+ dnParent( &e->e_nname, &pdn );
+ if ( ber_bvcmp( &pdn, &realbase ) ) {
+ goto loop_continue;
}
- } else if ( dn_issuffix( e->e_ndn, realbase ) ) {
+ } else if ( dnIsSuffix( &e->e_nname, &realbase ) ) {
/* alias is within scope */
- Debug( LDAP_DEBUG_ARGS, "search: \"%s\" in subtree\n",
+#ifdef NEW_LOGGING
+ LDAP_LOG( BACK_LDBM, DETAIL1,
+ "ldbm_search: alias \"%s\" in subtree\n", e->e_dn, 0, 0 );
+#else
+ Debug( LDAP_DEBUG_TRACE,
+ "ldbm_search: alias \"%s\" in subtree\n",
e->e_dn, 0, 0 );
+#endif
+
goto loop_continue;
}
if ( !manageDSAit && scope != LDAP_SCOPE_BASE &&
is_entry_referral( e ) )
{
- struct berval **refs = get_entry_referrals(
- be, conn, op, e );
+ struct berval dn;
+
+ /* check scope */
+ if ( !scopeok && scope == LDAP_SCOPE_ONELEVEL ) {
+ if ( !be_issuffix( be, &e->e_nname ) ) {
+ dnParent( &e->e_nname, &dn );
+ scopeok = dn_match( &dn, &realbase );
+ } else {
+ scopeok = (realbase.bv_len == 0);
+ }
- send_search_reference( be, conn, op,
- e, refs, scope, NULL, &v2refs );
+ } else if ( !scopeok && scope == LDAP_SCOPE_SUBTREE ) {
+ scopeok = dnIsSuffix( &e->e_nname, &realbase );
- ber_bvecfree( refs );
+ } else {
+ scopeok = 1;
+ }
+
+ if( scopeok ) {
+ BerVarray erefs = get_entry_referrals(
+ be, conn, op, e );
+ BerVarray refs = referral_rewrite( erefs,
+ &e->e_name, NULL,
+ scope == LDAP_SCOPE_SUBTREE
+ ? LDAP_SCOPE_SUBTREE
+ : LDAP_SCOPE_BASE );
+
+ send_search_reference( be, conn, op,
+ e, refs, NULL, &v2refs );
+
+ ber_bvarray_free( refs );
+
+ } else {
+#ifdef NEW_LOGGING
+ LDAP_LOG( BACK_LDBM, DETAIL2,
+ "ldbm_search: candidate referral %ld scope not okay\n",
+ id, 0, 0 );
+#else
+ Debug( LDAP_DEBUG_TRACE,
+ "ldbm_search: candidate referral %ld scope not okay\n",
+ id, 0, 0 );
+#endif
+ }
goto loop_continue;
}
+#ifdef SLAP_X_FILTER_HASSUBORDINATES
+ /*
+ * if hasSubordinates is used in the filter,
+ * append it to the entry's attributes
+ */
+ if ( filter_hasSubordinates ) {
+ int hs;
+
+ hs = has_children( be, e );
+ hasSubordinates = slap_operational_hasSubordinate( hs );
+ if ( hasSubordinates == NULL ) {
+ goto loop_continue;
+ }
+
+ hasSubordinates->a_next = e->e_attrs;
+ e->e_attrs = hasSubordinates;
+ }
+#endif /* SLAP_X_FILTER_HASSUBORDINATES */
+
/* if it matches the filter and scope, send it */
- if ( test_filter( be, conn, op, e, filter ) == LDAP_COMPARE_TRUE ) {
- char *dn;
+ result = test_filter( be, conn, op, e, filter );
+
+#ifdef SLAP_X_FILTER_HASSUBORDINATES
+ if ( hasSubordinates ) {
+ /*
+ * FIXME: this is fairly inefficient, because
+ * if hasSubordinates is among the required
+ * attrs, it will be added again later;
+ * maybe we should leave it and check
+ * check later if it's already present,
+ * if required
+ */
+ e->e_attrs = e->e_attrs->a_next;
+ attr_free( hasSubordinates );
+ }
+#endif /* SLAP_X_FILTER_HASSUBORDINATES */
+
+ if ( result == LDAP_COMPARE_TRUE ) {
+ struct berval dn;
/* check scope */
if ( !scopeok && scope == LDAP_SCOPE_ONELEVEL ) {
- if ( (dn = dn_parent( be, e->e_ndn )) != NULL ) {
- (void) dn_normalize( dn );
- scopeok = (dn == realbase)
- ? 1
- : (strcmp( dn, realbase ) ? 0 : 1 );
- free( dn );
-
+ if ( !be_issuffix( be, &e->e_nname ) ) {
+ dnParent( &e->e_nname, &dn );
+ scopeok = dn_match( &dn, &realbase );
} else {
- scopeok = (realbase == NULL || *realbase == '\0');
+ scopeok = (realbase.bv_len == 0);
}
} else if ( !scopeok && scope == LDAP_SCOPE_SUBTREE ) {
- dn = ch_strdup( e->e_ndn );
- scopeok = dn_issuffix( dn, realbase );
- free( dn );
+ scopeok = dnIsSuffix( &e->e_nname, &realbase );
} else {
scopeok = 1;
}
if (e) {
- int result;
-#ifdef BROKEN_NUM_SUBORDINATES
- /* Tack on subordinates attr */
- ID_BLOCK *idl = NULL;
- char CATTR_SUBS[] = "numsubordinates";
-
- if (attrs &&
- charray_inlist(attrs,
- CATTR_SUBS))
- {
- idl = dn2idl(be, e->e_ndn,
- DN_ONE_PREFIX);
- if (idl)
- {
- char buf[30];
- struct berval val, *vals[2];
-
- vals[0] = &val;
- vals[1] = NULL;
-
- sprintf(buf, "%lu",
- ID_BLOCK_NIDS(idl));
-
- val.bv_val = buf;
- val.bv_len = strlen(buf);
-
- attr_merge(e, CATTR_SUBS,
- vals);
- }
- }
-#endif
-
result = send_search_entry(be, conn, op,
e, attrs, attrsonly, NULL);
-#ifdef BROKEN_NUM_SUBORDINATES
- if (idl)
- {
- idl_free(idl);
- attr_delete(&e->e_attrs,
- CATTR_SUBS);
- }
-#endif
-
- switch (result)
- {
+ switch (result) {
case 0: /* entry sent ok */
nentries++;
break;
}
}
} else {
- Debug( LDAP_DEBUG_TRACE, "candidate %ld scope not okay\n",
+#ifdef NEW_LOGGING
+ LDAP_LOG( BACK_LDBM, DETAIL2,
+ "ldbm_search: candidate entry %ld scope not okay\n",
id, 0, 0 );
+#else
+ Debug( LDAP_DEBUG_TRACE,
+ "ldbm_search: candidate entry %ld scope not okay\n",
+ id, 0, 0 );
+#endif
}
+
} else {
- Debug( LDAP_DEBUG_TRACE, "candidate %ld does match filter\n",
+#ifdef NEW_LOGGING
+ LDAP_LOG( BACK_LDBM, DETAIL2,
+ "ldbm_search: candidate entry %ld does not match filter\n",
+ id, 0, 0 );
+#else
+ Debug( LDAP_DEBUG_TRACE,
+ "ldbm_search: candidate entry %ld does not match filter\n",
id, 0, 0 );
+#endif
}
loop_continue:
ldap_pvt_thread_yield();
}
+
send_search_result( conn, op,
v2refs == NULL ? LDAP_SUCCESS : LDAP_REFERRAL,
NULL, NULL, v2refs, NULL, nentries );
rc = 0;
done:
+ ldap_pvt_thread_rdwr_runlock(&li->li_giant_rwlock);
+
if( candidates != NULL )
idl_free( candidates );
- ber_bvecfree( v2refs );
- if( realbase ) free( realbase );
+ if( v2refs ) ber_bvarray_free( v2refs );
+ if( realbase.bv_val ) free( realbase.bv_val );
return rc;
}
static ID_BLOCK *
base_candidate(
Backend *be,
- Entry *e
-)
+ Entry *e )
{
ID_BLOCK *idl;
+#ifdef NEW_LOGGING
+ LDAP_LOG( BACK_LDBM, ENTRY, "base_candidate: base (%s)\n", e->e_dn, 0, 0 );
+#else
Debug(LDAP_DEBUG_TRACE, "base_candidates: base: \"%s\"\n",
e->e_dn, 0, 0);
+#endif
+
idl = idl_alloc( 1 );
idl_insert( &idl, e->e_id, 1 );
Filter *filter,
int scope,
int deref,
- int manageDSAit
-)
+ int manageDSAit )
{
ID_BLOCK *candidates;
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
- candidates = filter_candidates( be, filter );
+ Filter f, fand, rf, af, xf;
+ AttributeAssertion aa_ref, aa_alias;
+ struct berval bv_ref = { sizeof("REFERRAL")-1, "REFERRAL" };
+ struct berval bv_alias = { sizeof("ALIAS")-1, "ALIAS" };
+
+#ifdef NEW_LOGGING
+ LDAP_LOG( BACK_LDBM, DETAIL1,
+ "search_candidates: base (%s) scope %d deref %d\n",
+ e->e_ndn, scope, deref );
#else
-
- Filter rf, rf_or, af, af_or, lf, lf_and;
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
- AttributeDescription *ad_objectClass = slap_schema.si_ad_objectClass;
-#endif
-
- Debug(LDAP_DEBUG_TRACE, "search_candidates: base=\"%s\" s=%d d=%d\n",
+ Debug(LDAP_DEBUG_TRACE,
+ "search_candidates: base=\"%s\" s=%d d=%d\n",
e->e_ndn, scope, deref );
#endif
-#ifndef SLAPD_SCHEMA_NOT_COMPAT
+
+ xf.f_or = filter;
+ xf.f_choice = LDAP_FILTER_OR;
+ xf.f_next = NULL;
+
if( !manageDSAit ) {
/* match referrals */
- rf.f_next = NULL;
- rf.f_choice = LDAP_FILTER_OR;
- rf.f_or = &rf_or;
- rf.f_or->f_choice = LDAP_FILTER_EQUALITY;
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
- rf.f_or->f_av_desc = ad_objectClass;
- rf.f_or->f_av_value = ber_bvstrdup("REFERRAL");
-#else
- rf.f_or->f_avtype = ch_strdup( "objectclass" );
- rf.f_or->f_avvalue.bv_val = ch_strdup( "REFERRAL" );
- rf.f_or->f_avvalue.bv_len = sizeof("REFERRAL")-1;
-#endif
- rf.f_or->f_next = filter;
- filter = &rf;
- } else {
- rf.f_or = NULL;
+ rf.f_choice = LDAP_FILTER_EQUALITY;
+ rf.f_ava = &aa_ref;
+ rf.f_av_desc = slap_schema.si_ad_objectClass;
+ rf.f_av_value = bv_ref;
+ rf.f_next = xf.f_or;
+ xf.f_or = &rf;
}
if( deref & LDAP_DEREF_SEARCHING ) {
/* match aliases */
- af.f_next = NULL;
- af.f_choice = LDAP_FILTER_OR;
- af.f_or = &af_or;
- af.f_or->f_choice = LDAP_FILTER_EQUALITY;
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
- af.f_or->f_av_desc = objectClass;
- af.f_or->f_av_value = ber_bvstrdup("ALIAS");
-#else
- af.f_or->f_avtype = ch_strdup( "objectclass" );
- af.f_or->f_avvalue.bv_val = ch_strdup( "ALIAS" );
- af.f_or->f_avvalue.bv_len = sizeof("ALIAS")-1;
-#endif
- af.f_or->f_next = filter;
- filter = ⁡
- } else {
- af.f_or = NULL;
- }
-
- if ( scope == LDAP_SCOPE_SUBTREE ) {
- lf.f_next = NULL;
- lf.f_choice = LDAP_FILTER_AND;
- lf.f_and = &lf_and;
- lf.f_and->f_choice = SLAPD_FILTER_DN_SUBTREE;
- lf.f_and->f_dn = e->e_ndn;
- lf.f_and->f_next = filter;
- filter = &lf;
-
- } else if ( scope == LDAP_SCOPE_ONELEVEL ) {
- lf.f_next = NULL;
- lf.f_choice = LDAP_FILTER_AND;
- lf.f_and = &lf_and;
- lf.f_and->f_choice = SLAPD_FILTER_DN_ONE;
- lf.f_and->f_dn = e->e_ndn;
- lf.f_and->f_next = filter;
- filter = &lf;
+ af.f_choice = LDAP_FILTER_EQUALITY;
+ af.f_ava = &aa_alias;
+ af.f_av_desc = slap_schema.si_ad_objectClass;
+ af.f_av_value = bv_alias;
+ af.f_next = xf.f_or;
+ xf.f_or = ⁡
}
- candidates = filter_candidates( be, filter );
+ f.f_next = NULL;
+ f.f_choice = LDAP_FILTER_AND;
+ f.f_and = &fand;
+ fand.f_choice = scope == LDAP_SCOPE_SUBTREE
+ ? SLAPD_FILTER_DN_SUBTREE
+ : SLAPD_FILTER_DN_ONE;
+ fand.f_dn = &e->e_nname;
+ fand.f_next = xf.f_or == filter ? filter : &xf ;
- /* free dynamically allocated bits */
- if( af.f_or != NULL ) {
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
- ber_bvfree( af.f_or->f_av_value );
-#else
- free( af.f_or->f_avtype );
- free( af.f_or->f_avvalue.bv_val );
-#endif
- }
-
- if( rf.f_or != NULL ) {
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
- ber_bvfree( rf.f_or->f_av_value );
-#else
- free( rf.f_or->f_avtype );
- free( rf.f_or->f_avvalue.bv_val );
-#endif
- }
+ candidates = filter_candidates( be, &f );
-#endif
return( candidates );
}