/* search.c - search operation */
/* $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
*/
ID *ids );
static int search_candidates(
BackendDB *be,
+ Operation *op,
Entry *e,
Filter *filter,
int scope,
int deref,
- int manageDSAit,
ID *ids );
int
BackendDB *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,
+ struct berval *filterstr,
+ AttributeName *attrs,
int attrsonly )
{
struct bdb_info *bdb = (struct bdb_info *) be->be_private;
ID id, cursor;
ID candidates[BDB_IDL_UM_SIZE];
Entry *e = NULL;
- struct berval **v2refs = NULL;
+ BerVarray v2refs = NULL;
Entry *matched = NULL;
- char *realbase = NULL;
+ struct berval realbase = { 0, NULL };
int nentries = 0;
int manageDSAit;
manageDSAit = get_manageDSAit( op );
+ if ( nbase->bv_len == 0 ) {
+ /* DIT root special case */
+ e = (Entry *) &slap_entry_root;
+ rc = 0;
+ } else
#ifdef BDB_ALIASES
/* get entry with reader lock */
if ( deref & LDAP_DEREF_FINDING ) {
- e = deref_dn_r( be, nbase, &err, &matched, &text );
+ e = deref_dn_r( be, nbase-, &err, &matched, &text );
} else
#endif
}
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;
- refs = is_entry_referral( matched )
+ ber_dupbv( &matched_dn, &matched->e_name );
+
+ erefs = is_entry_referral( matched )
? get_entry_referrals( be, conn, op, matched )
: NULL;
+ bdb_entry_return( be, matched );
+ matched = NULL;
+
+ 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, rc=LDAP_REFERRAL ,
- matched_dn, text, refs, NULL );
-
- if( matched != NULL ) {
- ber_bvecfree( refs );
- free( matched_dn );
- bdb_entry_return( be, matched );
- matched = NULL;
- }
+ matched_dn.bv_val, text, refs, NULL );
+ if ( refs ) ber_bvarray_free( refs );
+ if ( matched_dn.bv_val ) ber_memfree( matched_dn.bv_val );
return rc;
}
- if (!manageDSAit && is_entry_referral( e ) ) {
+ if (!manageDSAit && e != &slap_entry_root && 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, 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,
+ base, scope );
+ 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, NULL, refs, NULL );
-
- ber_bvecfree( refs );
- free( matched_dn );
+ matched_dn.bv_val,
+ refs ? NULL : "bad referral object",
+ refs, NULL );
+ ber_bvarray_free( refs );
+ ber_memfree( matched_dn.bv_val );
return 1;
}
/* if not root, get appropriate limits */
- if ( be_isroot( be, op->o_ndn ) ) {
+ if ( be_isroot( be, &op->o_ndn ) ) {
isroot = 1;
} else {
- ( void ) get_limits( be, op->o_ndn, &limit );
+ ( void ) get_limits( be, &op->o_ndn, &limit );
}
/* The time/size limits come first because they require very little
* the request is not honored only because of time/size constraints */
/* if no time limit requested, use soft limit (unless root!) */
- if ( tlimit <= 0 ) {
- if ( isroot ) {
- tlimit = -1; /* allow root to set no limit */
- } else {
- tlimit = limit->lms_t_soft;
+ if ( isroot ) {
+ if ( tlimit == 0 ) {
+ tlimit = -1; /* allow root to set no limit */
+ }
+
+ if ( slimit == 0 ) {
+ slimit = -1;
}
- /* 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 ) {
+ } else {
+ /* if no limit is required, use soft limit */
+ if ( tlimit <= 0 ) {
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;
- }
+ /* 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;
+
+ /* 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 */
- }
-
- /* compute it anyway; root does not use it */
- stoptime = op->o_time + tlimit;
-
- /* if no size limit requested, use soft limit (unless root!) */
- if ( slimit == 0 ) {
- if ( isroot ) {
- slimit = -1; /* allow root to set no limit */
- } else {
- slimit = limit->lms_s_soft;
+ /* negative hard limit means no limit */
}
-
- /* 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 ) {
+
+ /* if no limit is required, use soft limit */
+ if ( slimit <= 0 ) {
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;
+ /* 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;
+
+ /* 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 */
}
-
- /* negative hard limit means no limit */
}
+ /* compute it anyway; root does not use it */
+ stoptime = op->o_time + tlimit;
+
/* select candidates */
if ( scope == LDAP_SCOPE_BASE ) {
rc = base_candidate( be, e, candidates );
} else {
- rc = search_candidates( be, e, filter,
- scope, deref, manageDSAit, candidates );
+ BDB_IDL_ALL( bdb, candidates );
+ rc = search_candidates( be, op, e, filter,
+ scope, deref, candidates );
}
/* need normalized dn below */
- realbase = ch_strdup( e->e_ndn );
+ ber_dupbv( &realbase, &e->e_nname );
- /* start cursor at base entry's id */
- cursor = e->e_id;
+ /* start cursor at base entry's id
+ * FIXME: hack to make "" base work */
+ cursor = e->e_id == NOID ? 1 : e->e_id;
- bdb_entry_return( be, e );
+ if ( e != &slap_entry_root ) {
+ bdb_entry_return( be, e );
+ }
e = NULL;
if ( candidates[0] == 0 ) {
/* if not root and candidates exceed to-be-checked entries, abort */
if ( !isroot && limit->lms_s_unchecked != -1 ) {
- if ( BDB_IDL_N(candidates) > limit->lms_s_unchecked ) {
+ if ( BDB_IDL_N(candidates) > (unsigned) limit->lms_s_unchecked ) {
send_search_result( conn, op,
LDAP_UNWILLING_TO_PERFORM,
NULL, NULL, NULL, NULL, 0 );
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( scope & LDAP_SCOPE_ONELEVEL ) {
char *pdn = dn_parent( NULL, e->e_ndn );
if ( pdn != NULL ) {
- if( strcmp( pdn, realbase ) ) {
- free( pdn );
+ if( strcmp( pdn, realbase.bv_val ) ) {
goto loop_continue;
}
- free(pdn);
}
- } else if ( dn_issuffix( e->e_ndn, realbase ) ) {
+ } else if ( dnIsSuffix( &e->e_nname, &realbase ) ) {
/* alias is within scope */
Debug( LDAP_DEBUG_TRACE,
"bdb_search: \"%s\" in subtree\n",
if ( !manageDSAit && scope != LDAP_SCOPE_BASE &&
is_entry_referral( e ) )
{
- struct berval **refs = get_entry_referrals(
+ 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, scope, NULL, &v2refs );
+ e, refs, NULL, &v2refs );
- ber_bvecfree( refs );
+ ber_bvarray_free( refs );
goto loop_continue;
}
/* check scope */
if ( !scopeok && scope == LDAP_SCOPE_ONELEVEL ) {
if ( (dn = dn_parent( be, e->e_ndn )) != NULL ) {
- (void) dn_normalize( dn );
- scopeok = (dn == realbase)
+ scopeok = (dn == realbase.bv_val)
? 1
- : (strcmp( dn, realbase ) ? 0 : 1 );
- free( dn );
-
+ : (strcmp( dn, realbase.bv_val ) ? 0 : 1 );
} 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;
rc = 0;
done:
- ber_bvecfree( v2refs );
- if( realbase ) ch_free( realbase );
+ if( v2refs ) ber_bvarray_free( v2refs );
+ if( realbase.bv_val ) ch_free( realbase.bv_val );
return rc;
}
return 0;
}
+/* Is "objectClass=xx" mentioned anywhere in this filter? Presence
+ * doesn't count, we're looking for explicit values.
+ */
+static int oc_filter(
+ Filter *f
+)
+{
+ int rc = 0;
+
+ switch(f->f_choice) {
+ case LDAP_FILTER_EQUALITY:
+ case LDAP_FILTER_APPROX:
+ if (f->f_av_desc == slap_schema.si_ad_objectClass)
+ rc = 1;
+ break;
+
+ case LDAP_FILTER_SUBSTRINGS:
+ if (f->f_sub_desc == slap_schema.si_ad_objectClass)
+ rc = 1;
+ break;
+
+ case LDAP_FILTER_AND:
+ case LDAP_FILTER_OR:
+ for (f=f->f_and; f; f=f->f_next)
+ if ((rc = oc_filter(f)))
+ break;
+ break;
+ default:
+ break;
+ }
+ 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 );
xf.f_choice = LDAP_FILTER_OR;
xf.f_next = NULL;
- if( !manageDSAit ) {
- /* match referrals */
- static struct berval bv_ref = { sizeof("REFERRAL")-1, "REFERRAL" };
- 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 the user's filter doesn't mention objectClass, or if
+ * it just uses objectClass=*, these clauses are redundant.
+ */
+ 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;
+ 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;
+ }
#ifdef BDB_ALIASES
- if( deref & LDAP_DEREF_SEARCHING ) {
- /* match aliases */
- static struct berval bv_alias = { sizeof("ALIAS")-1, "ALIAS" };
- 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 = ⁡
- }
+ if( deref & LDAP_DEREF_SEARCHING ) { /* match aliases */
+ struct berval bv_alias = { sizeof("ALIAS")-1, "ALIAS" };
+ 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 = ⁡
+ }
#endif
+ }
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_ndn;
- 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 );
+ rc = bdb_filter_candidates( be, &f, ids, tmp );
#else
+ /* FIXME: Original code:
BDB_IDL_ID( bdb, ids, e->e_id );
+ * this is a hack to make "" base work; when bdb_filter_candidates
+ * is used this should not be needed any more */
+ BDB_IDL_ID( bdb, ids, (e->e_id == NOID ? 1 : e->e_id) );
rc = 0;
#endif