ID *ids );
static int search_candidates(
BackendDB *be,
+ Operation *op,
Entry *e,
Filter *filter,
int scope,
int deref,
- int manageDSAit,
ID *ids );
int
ID id, cursor;
ID candidates[BDB_IDL_UM_SIZE];
Entry *e = NULL;
- BVarray v2refs = NULL;
+ BerVarray v2refs = NULL;
Entry *matched = NULL;
struct berval realbase = { 0, NULL };
int nentries = 0;
}
if ( e == NULL ) {
- struct berval *matched_dn = NULL;
- BVarray refs = NULL;
+ struct berval matched_dn = { 0, NULL };
+ BerVarray refs = NULL;
if ( matched != NULL ) {
- BVarray erefs;
- matched_dn = ber_bvdup( &matched->e_name );
+ BerVarray erefs;
+
+ ber_dupbv( &matched_dn, &matched->e_name );
erefs = is_entry_referral( matched )
? get_entry_referrals( be, conn, op, matched )
matched = NULL;
if( erefs ) {
- refs = referral_rewrite( erefs, matched_dn,
+ refs = referral_rewrite( erefs, &matched_dn,
base, scope );
- bvarray_free( erefs );
+ ber_bvarray_free( erefs );
}
} else {
}
send_ldap_result( conn, op, rc=LDAP_REFERRAL ,
- matched_dn ? matched_dn->bv_val : NULL, text, refs, NULL );
+ matched_dn.bv_val, text, refs, NULL );
- if ( refs ) bvarray_free( refs );
- if ( matched_dn ) ber_bvfree( matched_dn );
+ if ( refs ) ber_bvarray_free( refs );
+ if ( matched_dn.bv_val ) ber_memfree( matched_dn.bv_val );
return rc;
}
if (!manageDSAit && e != &slap_entry_root && is_entry_referral( e ) ) {
/* entry is a referral, don't allow add */
- struct berval *matched_dn = ber_bvdup( &e->e_name );
- BVarray erefs = get_entry_referrals( be, conn, op, e );
- BVarray refs = NULL;
+ struct berval matched_dn;
+ BerVarray erefs, refs;
+
+ ber_dupbv( &matched_dn, &e->e_name );
+ erefs = get_entry_referrals( be, conn, op, e );
+ refs = NULL;
bdb_entry_return( be, e );
e = NULL;
if( erefs ) {
- refs = referral_rewrite( erefs, matched_dn,
+ refs = referral_rewrite( erefs, &matched_dn,
base, scope );
- bvarray_free( erefs );
+ ber_bvarray_free( erefs );
}
Debug( LDAP_DEBUG_TRACE, "bdb_search: entry is referral\n",
0, 0, 0 );
send_ldap_result( conn, op, LDAP_REFERRAL,
- matched_dn->bv_val,
+ matched_dn.bv_val,
refs ? NULL : "bad referral object",
refs, NULL );
- bvarray_free( refs );
- ber_bvfree( matched_dn );
+ ber_bvarray_free( refs );
+ ber_memfree( matched_dn.bv_val );
return 1;
}
} else {
BDB_IDL_ALL( bdb, candidates );
- rc = search_candidates( be, e, filter,
- scope, deref, manageDSAit, candidates );
+ rc = search_candidates( be, op, e, filter,
+ scope, deref, candidates );
}
/* need normalized dn below */
goto loop_continue;
}
+ if ( is_entry_subentry( e ) ) {
+ if( scope != LDAP_SCOPE_BASE ) {
+ if(!get_subentries_visibility( op )) {
+ /* only subentries are visible */
+ goto loop_continue;
+ }
+ } else if ( get_subentries( op ) &&
+ !get_subentries_visibility( op ))
+ {
+ /* only subentries are visible */
+ goto loop_continue;
+ }
+ } else if ( get_subentries_visibility( op )) {
+ /* only subentries are visible */
+ goto loop_continue;
+ }
+
#ifdef BDB_ALIASES
if ( deref & LDAP_DEREF_SEARCHING && is_entry_alias( e ) ) {
Entry *matched;
if ( !manageDSAit && scope != LDAP_SCOPE_BASE &&
is_entry_referral( e ) )
{
- BVarray erefs = get_entry_referrals(
+ BerVarray erefs = get_entry_referrals(
be, conn, op, e );
- BVarray refs = referral_rewrite( erefs,
+ BerVarray refs = referral_rewrite( erefs,
&e->e_name, NULL,
scope == LDAP_SCOPE_SUBTREE
? LDAP_SCOPE_SUBTREE
send_search_reference( be, conn, op,
e, refs, NULL, &v2refs );
- bvarray_free( refs );
+ ber_bvarray_free( refs );
goto loop_continue;
}
rc = 0;
done:
- if( v2refs ) bvarray_free( v2refs );
+ if( v2refs ) ber_bvarray_free( v2refs );
if( realbase.bv_val ) ch_free( realbase.bv_val );
return rc;
static int search_candidates(
BackendDB *be,
+ Operation *op,
Entry *e,
Filter *filter,
int scope,
int deref,
- int manageDSAit,
ID *ids )
{
int rc;
- Filter f, fand, rf, xf;
+ Filter f, scopef, sf, rf, xf;
ID tmp[BDB_IDL_UM_SIZE];
AttributeAssertion aa_ref;
+ AttributeAssertion aa_subentry;
struct bdb_info *bdb = (struct bdb_info *) be->be_private;
#ifdef BDB_ALIASES
Filter af;
AttributeAssertion aa_alias;
#endif
+ /*
+ * This routine takes as input a filter (user-filter)
+ * and rewrites it as follows:
+ * (&(scope=DN)[(objectClass=subentry)]
+ * (|[(objectClass=referral)(objectClass=alias)](user-filter))
+ */
+
Debug(LDAP_DEBUG_TRACE,
"search_candidates: base=\"%s\" (0x%08lx) scope=%d\n",
e->e_dn, (long) e->e_id, scope );
/* If the user's filter doesn't mention objectClass, or if
* it just uses objectClass=*, these clauses are redundant.
*/
- if (oc_filter(filter)) {
- if( !manageDSAit ) { /* match referrals */
+ if (oc_filter(filter) && !get_subentries_visibility(op) ) {
+ if( !get_manageDSAit(op) ) { /* match referrals */
struct berval bv_ref = { sizeof("REFERRAL")-1, "REFERRAL" };
rf.f_choice = LDAP_FILTER_EQUALITY;
rf.f_ava = &aa_ref;
f.f_next = NULL;
f.f_choice = LDAP_FILTER_AND;
- f.f_and = &fand;
- fand.f_choice = scope == LDAP_SCOPE_SUBTREE
+ f.f_and = &scopef;
+ scopef.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 ;
-
+ scopef.f_dn = &e->e_nname;
+ scopef.f_next = xf.f_or == filter ? filter : &xf ;
+
+ if( get_subentries_visibility( op ) ) {
+ struct berval bv_subentry = { sizeof("SUBENTRY")-1, "SUBENTRY" };
+ sf.f_choice = LDAP_FILTER_EQUALITY;
+ sf.f_ava = &aa_subentry;
+ sf.f_av_desc = slap_schema.si_ad_objectClass;
+ sf.f_av_value = bv_subentry;
+ sf.f_next = scopef.f_next;
+ scopef.f_next = &sf;
+ }
#ifdef BDB_FILTER_INDICES
rc = bdb_filter_candidates( be, &f, ids, tmp );
projects / openldap / blobdiff