X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-ldbm%2Fsearch.c;h=e2e5b113c9bbf82dc9031ab4de6ed2164026e5a3;hb=1586a68219cf85e9caaafcf2259c9bc249358077;hp=dbbf761487bcf9632cccc1cd43fdc61d7052e3c7;hpb=73276e84ae32e9e148197971d1d6729739980353;p=openldap
diff --git a/servers/slapd/back-ldbm/search.c b/servers/slapd/back-ldbm/search.c
index dbbf761487..e2e5b113c9 100644
--- a/servers/slapd/back-ldbm/search.c
+++ b/servers/slapd/back-ldbm/search.c
@@ -1,4 +1,18 @@
/* search.c - ldbm backend search function */
+/* $OpenLDAP$ */
+/* This work is part of OpenLDAP Software .
+ *
+ * Copyright 1998-2003 The OpenLDAP Foundation.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in the file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * .
+ */
#include "portable.h"
@@ -15,178 +29,336 @@ static ID_BLOCK *base_candidate(
Backend *be, Entry *e );
static ID_BLOCK *search_candidates(
- Backend *be, Entry *e, Filter *filter,
+ Operation *op, Entry *e, Filter *filter,
int scope, int deref, int manageDSAit );
int
ldbm_back_search(
- Backend *be,
- Connection *conn,
Operation *op,
- char *base,
- int scope,
- int deref,
- int slimit,
- int tlimit,
- Filter *filter,
- char *filterstr,
- char **attrs,
- int attrsonly
-)
+ SlapReply *rs )
{
- struct ldbminfo *li = (struct ldbminfo *) be->be_private;
+ struct ldbminfo *li = (struct ldbminfo *) op->o_bd->be_private;
int rc, err;
- char *text;
+ const char *text = NULL;
time_t stoptime;
ID_BLOCK *candidates;
- ID id;
+ ID id, cursor;
Entry *e;
- struct berval **v2refs = NULL;
Entry *matched = NULL;
- char *realbase = NULL;
- int nentries = 0;
+ struct berval realbase = { 0, NULL };
int manageDSAit = get_manageDSAit( op );
-
+ int cscope = LDAP_SCOPE_DEFAULT;
+
+ struct slap_limits_set *limit = NULL;
+ int isroot = 0;
+
+#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 ( op->o_req_ndn.bv_len == 0 ) {
+ /* DIT root special case */
+ e = (Entry *) &slap_entry_root;
+
+ /* need normalized dn below */
+ ber_dupbv( &realbase, &e->e_nname );
- /* get entry with reader lock */
- if ( deref & LDAP_DEREF_FINDING ) {
- e = deref_dn_r( be, base, &err, &matched, &text );
+ candidates = search_candidates( op, e, op->oq_search.rs_filter,
+ op->oq_search.rs_scope, op->oq_search.rs_deref,
+ manageDSAit || get_domainScope(op) );
+
+ goto searchit;
+
+ } else if ( op->oq_search.rs_deref & LDAP_DEREF_FINDING ) {
+ /* deref dn and get entry with reader lock */
+ e = deref_dn_r( op->o_bd, &op->o_req_ndn, &rs->sr_err, &matched, &rs->sr_text );
+
+ if( rs->sr_err == LDAP_NO_SUCH_OBJECT ) rs->sr_err = LDAP_REFERRAL;
} else {
- e = dn2entry_r( be, base, &matched );
- err = e != NULL ? LDAP_SUCCESS : LDAP_REFERRAL;
- text = NULL;
+ /* get entry with reader lock */
+ e = dn2entry_r( op->o_bd, &op->o_req_ndn, &matched );
+ rs->sr_err = e != NULL ? LDAP_SUCCESS : LDAP_REFERRAL;
+ rs->sr_text = NULL;
}
if ( e == NULL ) {
- char *matched_dn = NULL;
- struct berval **refs = NULL;
+ struct berval matched_dn = { 0, 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 )
- ? get_entry_referrals( be, conn, op, matched )
+ erefs = is_entry_referral( matched )
+ ? get_entry_referrals( op, matched )
: NULL;
cache_return_entry_r( &li->li_cache, matched );
+
+ if( erefs ) {
+ rs->sr_ref = referral_rewrite( erefs, &matched_dn,
+ &op->o_req_dn, op->oq_search.rs_scope );
+
+ ber_bvarray_free( erefs );
+ }
+
} else {
- refs = default_referral;
+ rs->sr_ref = referral_rewrite( default_referral,
+ NULL, &op->o_req_dn, op->oq_search.rs_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 );
- }
+ rs->sr_matched = matched_dn.bv_val;
+ send_ldap_result( op, rs );
- return 1;
+ ber_bvarray_free( rs->sr_ref );
+ ber_memfree( matched_dn.bv_val );
+ rs->sr_ref = NULL;
+ rs->sr_matched = NULL;
+ return LDAP_REFERRAL;
}
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;
- cache_return_entry_r( &li->li_cache, e );
-
- Debug( LDAP_DEBUG_TRACE, "entry is referral\n", 0,
- 0, 0 );
+ ber_dupbv( &matched_dn, &e->e_name );
+ erefs = get_entry_referrals( op, e );
+ rs->sr_ref = NULL;
- send_ldap_result( conn, op, LDAP_REFERRAL,
- matched_dn, NULL, refs, NULL );
+ cache_return_entry_r( &li->li_cache, e );
+ ldap_pvt_thread_rdwr_runlock(&li->li_giant_rwlock);
+
+#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
+
+ if( erefs ) {
+ rs->sr_ref = referral_rewrite( erefs, &matched_dn,
+ &op->o_req_dn, op->oq_search.rs_scope );
+
+ ber_bvarray_free( erefs );
+ }
- ber_bvecfree( refs );
- free( matched_dn );
+ rs->sr_matched = matched_dn.bv_val;
+ if( rs->sr_ref ) {
+ rs->sr_err = LDAP_REFERRAL;
+ send_ldap_result( op, rs );
+ ber_bvarray_free( rs->sr_ref );
- return 1;
- }
+ } else {
+ send_ldap_error( op, rs, LDAP_OTHER,
+ "bad referral object" );
+ }
- 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;
+ ber_memfree( matched_dn.bv_val );
+ rs->sr_ref = NULL;
+ rs->sr_matched = NULL;
+ return LDAP_OTHER;
}
- 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 */
+ op->oq_search.rs_deref = LDAP_DEREF_NEVER;
}
- if ( scope == LDAP_SCOPE_BASE) {
- candidates = base_candidate( be, e );
+ if ( op->oq_search.rs_scope == LDAP_SCOPE_BASE ) {
+ cscope = LDAP_SCOPE_BASE;
+ candidates = base_candidate( op->o_bd, e );
} else {
- candidates = search_candidates( be, e, filter,
- scope, deref, manageDSAit );
+ cscope = ( op->oq_search.rs_scope != LDAP_SCOPE_SUBTREE )
+ ? LDAP_SCOPE_BASE : LDAP_SCOPE_SUBTREE;
+ candidates = search_candidates( op, e, op->oq_search.rs_filter,
+ op->oq_search.rs_scope, op->oq_search.rs_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
+
+ rs->sr_err = LDAP_SUCCESS;
+ send_ldap_result( op, rs );
+
+ rc = LDAP_SUCCESS;
+ goto done;
+ }
- send_search_result( conn, op,
- LDAP_SUCCESS,
- NULL, NULL, NULL, NULL, 0 );
+ /* if not root, get appropriate limits */
+ if ( be_isroot( op->o_bd, &op->o_ndn ) )
+ {
+ /*
+ * FIXME: I'd consider this dangerous if someone
+ * uses isroot for anything but handling limits
+ */
+ isroot = 1;
+ } else {
+ ( void ) get_limits( op->o_bd, &op->o_ndn, &limit );
+ }
- rc = 1;
- goto done;
+ /* 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_ldap_error( op, rs, LDAP_ADMINLIMIT_EXCEEDED,
+ NULL );
+ rc = LDAP_SUCCESS;
+ goto done;
+ }
}
+
+ /* if root an no specific limit is required, allow unlimited search */
+ if ( isroot ) {
+ if ( op->oq_search.rs_tlimit == 0 ) {
+ op->oq_search.rs_tlimit = -1;
+ }
- for ( id = idl_firstid( candidates ); id != NOID;
- id = idl_nextid( candidates, id ) )
+ if ( op->oq_search.rs_slimit == 0 ) {
+ op->oq_search.rs_slimit = -1;
+ }
+
+ } else {
+ /* if no limit is required, use soft limit */
+ if ( op->oq_search.rs_tlimit <= 0 ) {
+ op->oq_search.rs_tlimit = limit->lms_t_soft;
+
+ /* if requested limit higher than hard limit, abort */
+ } else if ( op->oq_search.rs_tlimit > limit->lms_t_hard ) {
+ /* no hard limit means use soft instead */
+ if ( limit->lms_t_hard == 0
+ && limit->lms_t_soft > -1
+ && op->oq_search.rs_tlimit > limit->lms_t_soft ) {
+ op->oq_search.rs_tlimit = limit->lms_t_soft;
+
+ /* positive hard limit means abort */
+ } else if ( limit->lms_t_hard > 0 ) {
+ send_ldap_error( op, rs,
+ LDAP_ADMINLIMIT_EXCEEDED,
+ NULL );
+ rc = LDAP_SUCCESS;
+ goto done;
+ }
+
+ /* negative hard limit means no limit */
+ }
+
+ /* if no limit is required, use soft limit */
+ if ( op->oq_search.rs_slimit <= 0 ) {
+ op->oq_search.rs_slimit = limit->lms_s_soft;
+
+ /* if requested limit higher than hard limit, abort */
+ } else if ( op->oq_search.rs_slimit > limit->lms_s_hard ) {
+ /* no hard limit means use soft instead */
+ if ( limit->lms_s_hard == 0
+ && limit->lms_s_soft > -1
+ && op->oq_search.rs_slimit > limit->lms_s_soft ) {
+ op->oq_search.rs_slimit = limit->lms_s_soft;
+
+ /* positive hard limit means abort */
+ } else if ( limit->lms_s_hard > 0 ) {
+ send_ldap_error( op, rs,
+ LDAP_ADMINLIMIT_EXCEEDED,
+ NULL );
+ rc = LDAP_SUCCESS;
+ goto done;
+ }
+
+ /* negative hard limit means no limit */
+ }
+ }
+
+ /* compute it anyway; root does not use it */
+ stoptime = op->o_time + op->oq_search.rs_tlimit;
+ rs->sr_attrs = op->oq_search.rs_attrs;
+
+ for ( id = idl_firstid( candidates, &cursor ); id != NOID;
+ id = idl_nextid( candidates, &cursor ) )
{
- int scopeok = 0;
+ int scopeok = 0;
+ int result = 0;
/* 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;
+ rc = LDAP_SUCCESS;
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,
- NULL, NULL, v2refs, NULL, nentries );
- rc = 0;
+ if ( op->oq_search.rs_tlimit != -1 && slap_get_time() > stoptime ) {
+ rs->sr_err = LDAP_TIMELIMIT_EXCEEDED;
+ send_ldap_result( op, rs );
+ rc = LDAP_SUCCESS;
goto done;
}
/* get the entry with reader lock */
- e = id2entry_r( be, id );
+ e = id2entry_r( op->o_bd, 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;
+ }
+
+ rs->sr_entry = e;
+#ifdef LDBM_SUBENTRIES
+ if ( is_entry_subentry( e ) ) {
+ if( op->oq_search.rs_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;
+ }
+#endif
- if ( deref & LDAP_DEREF_SEARCHING && is_entry_alias( e ) ) {
+ if ( op->oq_search.rs_deref & LDAP_DEREF_SEARCHING && is_entry_alias( e ) ) {
Entry *matched;
int err;
- char *text;
+ const char *text;
- e = deref_entry_r( be, e, &err, &matched, &text );
+ e = deref_entry_r( op->o_bd, e, &err, &matched, &text );
if( e == NULL ) {
e = matched;
@@ -199,23 +371,29 @@ ldbm_back_search(
}
/* 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);
+ if( op->oq_search.rs_scope & LDAP_SCOPE_ONELEVEL ) {
+ 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;
}
+ rs->sr_entry = e;
+
scopeok = 1;
}
@@ -224,41 +402,76 @@ ldbm_back_search(
* this for non-base searches, and don't check the filter
* explicitly here since it's only a candidate anyway.
*/
- if ( !manageDSAit && scope != LDAP_SCOPE_BASE &&
+ if ( !manageDSAit && op->oq_search.rs_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 && op->oq_search.rs_scope == LDAP_SCOPE_ONELEVEL ) {
+ if ( !be_issuffix( op->o_bd, &e->e_nname ) ) {
+ dnParent( &e->e_nname, &dn );
+ scopeok = dn_match( &dn, &realbase );
+ } else {
+ scopeok = (realbase.bv_len == 0);
+ }
+
+ } else if ( !scopeok && op->oq_search.rs_scope == LDAP_SCOPE_SUBTREE ) {
+ scopeok = dnIsSuffix( &e->e_nname, &realbase );
+
+ } else {
+ scopeok = 1;
+ }
+
+ if( scopeok ) {
+ BerVarray erefs = get_entry_referrals( op, e );
+ rs->sr_ref = referral_rewrite( erefs,
+ &e->e_name, NULL,
+ op->oq_search.rs_scope == LDAP_SCOPE_SUBTREE
+ ? LDAP_SCOPE_SUBTREE
+ : LDAP_SCOPE_BASE );
+
+ send_search_reference( op, rs );
- send_search_reference( be, conn, op,
- e, refs, scope, NULL, &v2refs );
+ ber_bvarray_free( rs->sr_ref );
+ rs->sr_ref = NULL;
+
+ } 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
+ }
- ber_bvecfree( refs );
+ goto loop_continue;
+ }
+ if ( !manageDSAit && is_entry_glue( e )) {
goto loop_continue;
}
/* if it matches the filter and scope, send it */
- if ( test_filter( be, conn, op, e, filter ) == 0 ) {
- char *dn;
+ result = test_filter( op, e, op->oq_search.rs_filter );
- /* check scope */
- if ( !scopeok && scope == LDAP_SCOPE_ONELEVEL ) {
- if ( (dn = dn_parent( be, e->e_ndn )) != NULL ) {
- (void) dn_normalize_case( dn );
- scopeok = (dn == realbase)
- ? 1
- : (strcmp( dn, realbase ) ? 0 : 1 );
- free( dn );
+ if ( result == LDAP_COMPARE_TRUE ) {
+ struct berval dn;
+ /* check scope */
+ if ( !scopeok && op->oq_search.rs_scope == LDAP_SCOPE_ONELEVEL ) {
+ if ( !be_issuffix( op->o_bd, &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 );
+ } else if ( !scopeok && op->oq_search.rs_scope == LDAP_SCOPE_SUBTREE ) {
+ scopeok = dnIsSuffix( &e->e_nname, &realbase );
} else {
scopeok = 1;
@@ -266,36 +479,51 @@ ldbm_back_search(
if ( scopeok ) {
/* check size limit */
- if ( --slimit == -1 ) {
+ if ( --op->oq_search.rs_slimit == -1 ) {
cache_return_entry_r( &li->li_cache, e );
- send_search_result( conn, op,
- LDAP_SIZELIMIT_EXCEEDED, NULL, NULL,
- v2refs, NULL, nentries );
- rc = 0;
+ rs->sr_err = LDAP_SIZELIMIT_EXCEEDED;
+ send_ldap_result( op, rs );
+ rc = LDAP_SUCCESS;
goto done;
}
if (e) {
- switch ( send_search_entry( be, conn, op, e,
- attrs, attrsonly, 0, NULL ) ) {
+
+ result = send_search_entry( op, rs );
+
+ switch (result) {
case 0: /* entry sent ok */
- nentries++;
break;
case 1: /* entry not sent */
break;
case -1: /* connection closed */
cache_return_entry_r( &li->li_cache, e );
- rc = 0;
+ rc = LDAP_SUCCESS;
goto done;
}
}
} 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:
@@ -306,17 +534,21 @@ loop_continue:
ldap_pvt_thread_yield();
}
- send_search_result( conn, op,
- v2refs == NULL ? LDAP_SUCCESS : LDAP_REFERRAL,
- NULL, NULL, v2refs, NULL, nentries );
- rc = 0;
+ rs->sr_err = rs->sr_v2ref ? LDAP_REFERRAL : LDAP_SUCCESS;
+ rs->sr_ref = rs->sr_v2ref;
+ send_ldap_result( op, rs );
+
+ rc = LDAP_SUCCESS;
done:
- idl_free( candidates );
+ ldap_pvt_thread_rdwr_runlock(&li->li_giant_rwlock);
+
+ if( candidates != NULL )
+ idl_free( candidates );
- ber_bvecfree( v2refs );
- if( realbase ) free( realbase );
+ if( rs->sr_v2ref ) ber_bvarray_free( rs->sr_v2ref );
+ if( realbase.bv_val ) free( realbase.bv_val );
return rc;
}
@@ -324,13 +556,17 @@ done:
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 );
@@ -340,109 +576,80 @@ base_candidate(
static ID_BLOCK *
search_candidates(
- Backend *be,
+ Operation *op,
Entry *e,
Filter *filter,
int scope,
int deref,
- int manageDSAit
-)
+ int manageDSAit )
{
- struct ldbminfo *li = (struct ldbminfo *) be->be_private;
ID_BLOCK *candidates;
- Filter *f, *rf, *af, *lf;
-
- Debug(LDAP_DEBUG_TRACE, "search_candidates: base=\"%s\" s=%d d=%d\n",
+ 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 LDBM_SUBENTRIES
+ Filter sf;
+ AttributeAssertion aa_subentry;
+#endif
+
+#ifdef NEW_LOGGING
+ LDAP_LOG( BACK_LDBM, DETAIL1,
+ "search_candidates: base (%s) scope %d deref %d\n",
+ e->e_ndn, scope, deref );
+#else
+ Debug(LDAP_DEBUG_TRACE,
+ "search_candidates: base=\"%s\" s=%d d=%d\n",
e->e_ndn, scope, deref );
+#endif
+
- f = NULL;
+ xf.f_or = filter;
+ xf.f_choice = LDAP_FILTER_OR;
+ xf.f_next = NULL;
if( !manageDSAit ) {
/* match referrals */
- rf = (Filter *) ch_malloc( sizeof(Filter) );
- rf->f_next = NULL;
- rf->f_choice = LDAP_FILTER_OR;
- rf->f_or = (Filter *) ch_malloc( sizeof(Filter) );
- rf->f_or->f_choice = LDAP_FILTER_EQUALITY;
- 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;
- rf->f_or->f_next = filter;
- f = rf;
- } else {
- rf = NULL;
- f = filter;
+ 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 = (Filter *) ch_malloc( sizeof(Filter) );
- af->f_next = NULL;
- af->f_choice = LDAP_FILTER_OR;
- af->f_or = (Filter *) ch_malloc( sizeof(Filter) );
- af->f_or->f_choice = LDAP_FILTER_EQUALITY;
- 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;
- af->f_or->f_next = f;
- f = af;
- } else {
- af = NULL;
+ 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 ( scope == LDAP_SCOPE_SUBTREE ) {
- lf = (Filter *) ch_malloc( sizeof(Filter) );
- lf->f_next = NULL;
- lf->f_choice = LDAP_FILTER_AND;
- lf->f_and = (Filter *) ch_malloc( sizeof(Filter) );
-
- lf->f_and->f_choice = LDAP_FILTER_SUBSTRINGS;
- lf->f_and->f_sub_type = ch_strdup( "dn" );
- lf->f_and->f_sub_initial = NULL;
- lf->f_and->f_sub_any = NULL;
- lf->f_and->f_sub_final = ch_strdup( e->e_ndn );
-
- lf->f_and->f_next = f;
- f = lf;
-
- } else if ( scope == LDAP_SCOPE_ONELEVEL ) {
- char buf[16];
-
- lf = (Filter *) ch_malloc( sizeof(Filter) );
- lf->f_next = NULL;
- lf->f_choice = LDAP_FILTER_AND;
- lf->f_and = (Filter *) ch_malloc( sizeof(Filter) );
-
- lf->f_and->f_choice = LDAP_FILTER_EQUALITY;
- lf->f_and->f_ava.ava_type = ch_strdup( "id2children" );
- sprintf( buf, "%ld", e != NULL ? e->e_id : 0 );
- lf->f_and->f_ava.ava_value.bv_val = ch_strdup( buf );
- lf->f_and->f_ava.ava_value.bv_len = strlen( buf );
-
- lf->f_and->f_next = f;
- f = lf;
-
- } else {
- lf = NULL;
+ 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 ;
+
+#ifdef LDBM_SUBENTRIES
+ 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 = fand.f_next;
+ fand.f_next = &sf;
}
+#endif
- candidates = filter_candidates( be, f );
-
- /* free up filter additions we allocated above */
- if( lf != NULL ) {
- lf->f_and->f_next = NULL;
- filter_free( lf );
- }
-
- if( af != NULL ) {
- af->f_or->f_next = NULL;
- filter_free( af );
- }
-
- if( rf != NULL ) {
- rf->f_or->f_next = NULL;
- filter_free( rf );
- }
+ candidates = filter_candidates( op, &f );
return( candidates );
}