/* 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,
+ struct berval *filterstr,
+ AttributeName *attrs,
int attrsonly )
{
struct ldbminfo *li = (struct ldbminfo *) be->be_private;
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;
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_ENTRY,
- "ldbm_back_search: enter\n" ));
+ "ldbm_back_search: enter\n" ));
#else
Debug(LDAP_DEBUG_TRACE, "=> ldbm_back_search\n", 0, 0, 0);
#endif
- if ( *nbase == '\0' ) {
+ if ( nbase->bv_len == 0 ) {
/* DIT root special case */
e = (Entry *) &slap_entry_root;
/* need normalized dn below */
- realbase = ch_strdup( e->e_ndn );
+ ber_dupbv( &realbase, &e->e_nname );
candidates = search_candidates( be, e, filter,
scope, deref, manageDSAit );
}
if ( e == NULL ) {
- char *matched_dn = NULL;
- struct berval **refs = NULL;
+ struct berval matched_dn = { 0, NULL };
+ BerVarray refs = NULL;
if ( matched != NULL ) {
- struct berval **erefs;
- matched_dn = ch_strdup( matched->e_dn );
+ BerVarray erefs;
+ ber_dupbv( &matched_dn, &matched->e_name );
erefs = is_entry_referral( matched )
- ? get_entry_referrals( be, conn, op, matched,
- base, scope )
+ ? get_entry_referrals( be, conn, op, matched )
: NULL;
cache_return_entry_r( &li->li_cache, matched );
if( erefs ) {
- refs = referral_rewrite( erefs, matched_dn,
+ refs = referral_rewrite( erefs, &matched_dn,
base, scope );
- ber_bvecfree( erefs );
+ ber_bvarray_free( erefs );
}
} else {
NULL, base, scope );
}
- send_ldap_result( conn, op, err,
- matched_dn, text, refs, NULL );
+ send_ldap_result( conn, op, err, matched_dn.bv_val,
+ text, refs, NULL );
- ber_bvecfree( refs );
- free( matched_dn );
+ 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 **erefs = get_entry_referrals( be,
- conn, op, e, base, scope );
- struct berval **refs = NULL;
+ 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 );
#endif
if( erefs ) {
- refs = referral_rewrite( erefs, matched_dn,
+ refs = referral_rewrite( erefs, &matched_dn,
base, scope );
- ber_bvecfree( erefs );
+ ber_bvarray_free( erefs );
}
if( refs ) {
send_ldap_result( conn, op, LDAP_REFERRAL,
- matched_dn, NULL, refs, NULL );
- ber_bvecfree( refs );
+ matched_dn.bv_val, NULL, refs, NULL );
+ ber_bvarray_free( refs );
} else {
- send_ldap_result( conn, op, LDAP_OTHER, matched_dn,
- "bad referral object", NULL, NULL );
+ send_ldap_result( conn, op, LDAP_OTHER,
+ matched_dn.bv_val,
+ "bad referral object", NULL, NULL );
}
- free( matched_dn );
+ ber_memfree( matched_dn.bv_val );
return 1;
}
}
/* need normalized dn below */
- realbase = ch_strdup( e->e_ndn );
+ ber_dupbv( &realbase, &e->e_nname );
cache_return_entry_r( &li->li_cache, e );
if ( be_isroot( be, &op->o_ndn ) ) {
isroot = 1;
} else {
- ( void ) get_limits( be, op->o_ndn.bv_val, &limit );
+ ( void ) get_limits( be, &op->o_ndn, &limit );
}
/* if candidates exceed to-be-checked entries, abort */
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;
}
}
- } else if ( dn_issuffix( e->e_ndn, realbase ) ) {
+ } else if ( dnIsSuffix( &e->e_nname, &realbase ) ) {
/* alias is within scope */
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_DETAIL1,
/* check scope */
if ( !scopeok && scope == LDAP_SCOPE_ONELEVEL ) {
if ( (dn = dn_parent( be, e->e_ndn )) != NULL ) {
- scopeok = (dn == realbase)
+ scopeok = (dn == realbase.bv_val)
? 1
- : (strcmp( dn, realbase ) ? 0 : 1 );
+ : (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;
}
if( scopeok ) {
- struct berval **erefs = get_entry_referrals(
- be, conn, op, e, NULL, cscope );
- struct berval **refs = referral_rewrite( erefs, e->e_dn, NULL,
+ 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_bvecfree( refs );
+ ber_bvarray_free( refs );
} else {
#ifdef NEW_LOGGING
/* check scope */
if ( !scopeok && scope == LDAP_SCOPE_ONELEVEL ) {
if ( (dn = dn_parent( be, e->e_ndn )) != NULL ) {
- scopeok = (dn == realbase)
+ scopeok = (dn == realbase.bv_val)
? 1
- : (strcmp( dn, realbase ) ? 0 : 1 );
+ : (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;
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;
}
ID_BLOCK *candidates;
Filter f, fand, rf, af, xf;
AttributeAssertion aa_ref, aa_alias;
- static struct berval bv_ref = { sizeof("REFERRAL")-1, "REFERRAL" };
- static struct berval bv_alias = { sizeof("ALIAS")-1, "ALIAS" };
+ struct berval bv_ref = { sizeof("REFERRAL")-1, "REFERRAL" };
+ struct berval bv_alias = { sizeof("ALIAS")-1, "ALIAS" };
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_DETAIL1,
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_av_value = bv_ref;
rf.f_next = xf.f_or;
xf.f_or = &rf;
}
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_av_value = bv_alias;
af.f_next = xf.f_or;
xf.f_or = ⁡
}
fand.f_choice = scope == LDAP_SCOPE_SUBTREE
? SLAPD_FILTER_DN_SUBTREE
: SLAPD_FILTER_DN_ONE;
- fand.f_dn = e->e_ndn;
+ fand.f_dn = &e->e_nname;
fand.f_next = xf.f_or == filter ? filter : &xf ;
candidates = filter_candidates( be, &f );
projects / openldap / blobdiff