#include "entry-id.h"
#include "util.h"
+#define BACKSQL_STOP 0
+#define BACKSQL_CONTINUE 1
+
+static int backsql_process_filter( backsql_srch_info *bsi, Filter *f );
+
static int
backsql_attrlist_add( backsql_srch_info *bsi, AttributeDescription *ad )
{
return 1;
}
+ /*
+ * clear the list (retrieve all attrs)
+ */
+ if ( ad == NULL ) {
+ ch_free( bsi->attrs );
+ bsi->attrs = NULL;
+ return 1;
+ }
+
for ( ; bsi->attrs[ n_attrs ].an_name.bv_val; n_attrs++ ) {
an = &bsi->attrs[ n_attrs ];
void
backsql_init_search(
backsql_srch_info *bsi,
- backsql_info *bi,
- struct berval *nbase,
+ struct berval *base,
int scope,
int slimit,
int tlimit,
time_t stoptime,
Filter *filter,
SQLHDBC dbh,
- BackendDB *be,
- Connection *conn,
Operation *op,
AttributeName *attrs )
{
AttributeName *p;
- bsi->base_dn = nbase;
+ bsi->base_dn = base;
bsi->scope = scope;
bsi->slimit = slimit;
bsi->tlimit = tlimit;
bsi->filter = filter;
bsi->dbh = dbh;
- bsi->be = be;
- bsi->conn = conn;
bsi->op = op;
- bsi->attr_flags = 0;
+ bsi->bsi_flags = 0;
- /*
- * FIXME: need to discover how to deal with 1.1 (NoAttrs)
- */
-
/*
* handle "*"
*/
for ( p = attrs; p->an_name.bv_val; p++ ) {
/*
- * ignore "+"
+ * ignore "1.1"; handle "+"
*/
if ( BACKSQL_NCMP( &p->an_name, &AllOper ) == 0 ) {
+ bsi->bsi_flags |= BSQL_SF_ALL_OPER;
continue;
} else if ( BACKSQL_NCMP( &p->an_name, &NoAttrs ) == 0 ) {
- bsi->attr_flags |= BSQL_SF_ALL_OPER;
continue;
}
bsi->id_list = NULL;
bsi->n_candidates = 0;
bsi->stoptime = stoptime;
- bsi->bi = bi;
- bsi->sel.bv_val = NULL;
- bsi->sel.bv_len = 0;
- bsi->sel_len = 0;
- bsi->from.bv_val = NULL;
- bsi->from.bv_len = 0;
- bsi->from_len = 0;
- bsi->join_where.bv_val = NULL;
- bsi->join_where.bv_len = 0;
- bsi->jwhere_len = 0;
- bsi->flt_where.bv_val = NULL;
- bsi->flt_where.bv_len = 0;
- bsi->fwhere_len = 0;
+ bsi->sel.bb_val.bv_val = NULL;
+ bsi->sel.bb_val.bv_len = 0;
+ bsi->sel.bb_len = 0;
+ bsi->from.bb_val.bv_val = NULL;
+ bsi->from.bb_val.bv_len = 0;
+ bsi->from.bb_len = 0;
+ bsi->join_where.bb_val.bv_val = NULL;
+ bsi->join_where.bb_val.bv_len = 0;
+ bsi->join_where.bb_len = 0;
+ bsi->flt_where.bb_val.bv_val = NULL;
+ bsi->flt_where.bb_val.bv_len = 0;
+ bsi->flt_where.bb_len = 0;
bsi->status = LDAP_SUCCESS;
}
-int
+static int
backsql_process_filter_list( backsql_srch_info *bsi, Filter *f, int op )
{
int res;
return 0;
}
- backsql_strfcat( &bsi->flt_where, &bsi->fwhere_len, "c", '(' /* ) */ );
+ backsql_strfcat( &bsi->flt_where, "c", '(' /* ) */ );
while ( 1 ) {
res = backsql_process_filter( bsi, f );
switch ( op ) {
case LDAP_FILTER_AND:
- backsql_strfcat( &bsi->flt_where, &bsi->fwhere_len, "l",
+ backsql_strfcat( &bsi->flt_where, "l",
(ber_len_t)sizeof( " AND " ) - 1,
" AND " );
break;
case LDAP_FILTER_OR:
- backsql_strfcat( &bsi->flt_where, &bsi->fwhere_len, "l",
+ backsql_strfcat( &bsi->flt_where, "l",
(ber_len_t)sizeof( " OR " ) - 1,
" OR " );
break;
}
}
- backsql_strfcat( &bsi->flt_where, &bsi->fwhere_len, "c", /* ( */ ')' );
+ backsql_strfcat( &bsi->flt_where, "c", /* ( */ ')' );
return 1;
}
-int
+static int
backsql_process_sub_filter( backsql_srch_info *bsi, Filter *f )
{
int i;
backsql_at_map_rec *at;
+ backsql_info *bi = (backsql_info *)bsi->op->o_bd->be_private;
+ int casefold = 0;
if ( !f ) {
return 0;
}
+ if ( SLAP_MR_ASSOCIATED( f->f_sub_desc->ad_type->sat_substr,
+ bi->bi_caseIgnoreMatch ) ) {
+ casefold = 1;
+ }
+
at = backsql_ad2at( bsi->oc, f->f_sub_desc );
assert( at );
* SQL filters are more liberal.
*/
- backsql_strfcat( &bsi->flt_where, &bsi->fwhere_len, "c", '(' /* ) */ );
+ backsql_strfcat( &bsi->flt_where, "c", '(' /* ) */ );
/* TimesTen */
Debug( LDAP_DEBUG_TRACE, "expr: '%s' '%s'\n", at->sel_expr.bv_val,
at->sel_expr_u.bv_val ? at->sel_expr_u.bv_val : "<NULL>", 0 );
- if ( bsi->bi->upper_func.bv_val ) {
+ if ( casefold && bi->upper_func.bv_val ) {
/*
* If a pre-upper-cased version of the column exists, use it
*/
if ( at->sel_expr_u.bv_val ) {
- backsql_strfcat( &bsi->flt_where, &bsi->fwhere_len,
+ backsql_strfcat( &bsi->flt_where,
"bl",
&at->sel_expr_u,
(ber_len_t)sizeof( " LIKE '" ) - 1,
" LIKE '" );
} else {
- backsql_strfcat( &bsi->flt_where, &bsi->fwhere_len,
+ backsql_strfcat( &bsi->flt_where,
"bcbcl",
- &bsi->bi->upper_func,
+ &bi->upper_func,
'(',
&at->sel_expr,
')',
" LIKE '" );
}
} else {
- backsql_strfcat( &bsi->flt_where, &bsi->fwhere_len, "bl",
+ backsql_strfcat( &bsi->flt_where, "bl",
&at->sel_expr,
(ber_len_t)sizeof( " LIKE '" ) - 1, " LIKE '" );
}
if ( f->f_sub_initial.bv_val != NULL ) {
size_t start;
- start = bsi->flt_where.bv_len;
- backsql_strfcat( &bsi->flt_where, &bsi->fwhere_len, "b",
+ start = bsi->flt_where.bb_val.bv_len;
+ backsql_strfcat( &bsi->flt_where, "b",
&f->f_sub_initial );
- if ( bsi->bi->upper_func.bv_val ) {
- ldap_pvt_str2upper( &bsi->flt_where.bv_val[ start ] );
+ if ( casefold && bi->upper_func.bv_val ) {
+ ldap_pvt_str2upper( &bsi->flt_where.bb_val.bv_val[ start ] );
}
}
- backsql_strfcat( &bsi->flt_where, &bsi->fwhere_len, "c", '%' );
+ backsql_strfcat( &bsi->flt_where, "c", '%' );
if ( f->f_sub_any != NULL ) {
for ( i = 0; f->f_sub_any[ i ].bv_val != NULL; i++ ) {
0, 0 );
#endif /* BACKSQL_TRACE */
- start = bsi->flt_where.bv_len;
- backsql_strfcat( &bsi->flt_where, &bsi->fwhere_len,
+ start = bsi->flt_where.bb_val.bv_len;
+ backsql_strfcat( &bsi->flt_where,
"bc",
&f->f_sub_any[ i ],
'%' );
- if ( bsi->bi->upper_func.bv_val ) {
+ if ( casefold && bi->upper_func.bv_val ) {
/*
* Note: toupper('%') = '%'
*/
- ldap_pvt_str2upper( &bsi->flt_where.bv_val[ start ] );
+ ldap_pvt_str2upper( &bsi->flt_where.bb_val.bv_val[ start ] );
}
}
if ( f->f_sub_final.bv_val != NULL ) {
size_t start;
- start = bsi->flt_where.bv_len;
- backsql_strfcat( &bsi->flt_where, &bsi->fwhere_len, "b",
+ start = bsi->flt_where.bb_val.bv_len;
+ backsql_strfcat( &bsi->flt_where, "b",
&f->f_sub_final );
- if ( bsi->bi->upper_func.bv_val ) {
- ldap_pvt_str2upper( &bsi->flt_where.bv_val[ start ] );
+ if ( casefold && bi->upper_func.bv_val ) {
+ ldap_pvt_str2upper( &bsi->flt_where.bb_val.bv_val[ start ] );
}
}
}
- backsql_strfcat( &bsi->flt_where, &bsi->fwhere_len, "l",
+ backsql_strfcat( &bsi->flt_where, "l",
(ber_len_t)sizeof( /* (' */ "')" ) - 1, /* ( */ "')" );
return 1;
}
-int
+static int
backsql_process_filter( backsql_srch_info *bsi, Filter *f )
{
+ backsql_info *bi = (backsql_info *)bsi->op->o_bd->be_private;
backsql_at_map_rec *at;
backsql_at_map_rec oc_attr = {
slap_schema.si_ad_objectClass, BER_BVC(""), BER_BVC(""),
- { 0, NULL }, NULL, NULL, NULL };
+ BER_BVNULL, NULL, NULL, NULL };
AttributeDescription *ad = NULL;
int done = 0;
- ber_len_t len = 0;
- /* TimesTen */
+ int casefold = 0;
int rc = 0;
+ struct berval *filter_value = NULL;
+ MatchingRule *matching_rule = NULL;
+ struct berval ordering = BER_BVC("<=");
Debug( LDAP_DEBUG_TRACE, "==>backsql_process_filter()\n", 0, 0, 0 );
if ( f == NULL || f->f_choice == SLAPD_FILTER_COMPUTED ) {
case LDAP_FILTER_AND:
rc = backsql_process_filter_list( bsi, f->f_and,
- LDAP_FILTER_AND);
+ LDAP_FILTER_AND );
done = 1;
break;
case LDAP_FILTER_NOT:
- backsql_strfcat( &bsi->flt_where, &bsi->fwhere_len, "l",
+ backsql_strfcat( &bsi->flt_where, "l",
(ber_len_t)sizeof( "NOT (" /* ) */ ) - 1,
"NOT (" /* ) */ );
rc = backsql_process_filter( bsi, f->f_not );
- backsql_strfcat( &bsi->flt_where, &bsi->fwhere_len, "c",
- /* ( */ ')' );
+ backsql_strfcat( &bsi->flt_where, "c", /* ( */ ')' );
done = 1;
break;
ad = f->f_desc;
break;
+ case LDAP_FILTER_EXT:
+ ad = f->f_mra->ma_desc;
+ break;
+
default:
ad = f->f_av_desc;
break;
}
if ( rc == -1 ) {
- /* TimesTen : Don't run the query */
goto impossible;
}
goto done;
}
- if ( ad != slap_schema.si_ad_objectClass ) {
- at = backsql_ad2at( bsi->oc, ad );
+ /*
+ * Turn structuralObjectClass into objectClass
+ */
+ if ( ad == slap_schema.si_ad_objectClass
+ || ad == slap_schema.si_ad_structuralObjectClass ) {
+ struct berbuf bb = BB_NULL;
- } else {
at = &oc_attr;
- backsql_strfcat( &at->sel_expr, &len, "cbc",
+ backsql_strfcat( &bb, "cbc",
'\'',
- &bsi->oc->name,
+ &bsi->oc->oc->soc_cname,
'\'' );
+ at->sel_expr = bb.bb_val;
+
+ } else if ( ad == slap_schema.si_ad_hasSubordinates || ad == NULL ) {
+ /*
+ * FIXME: this is not robust; e.g. a filter
+ * '(!(hasSubordinates=TRUE))' fails because
+ * in SQL it would read 'NOT (1=1)' instead
+ * of no condition.
+ * Note however that hasSubordinates is boolean,
+ * so a more appropriate filter would be
+ * '(hasSubordinates=FALSE)'
+ *
+ * A more robust search for hasSubordinates
+ * would * require joining the ldap_entries table
+ * selecting if there are descendants of the
+ * candidate.
+ */
+ backsql_strfcat( &bsi->flt_where, "l",
+ (ber_len_t)sizeof( "1=1" ) - 1, "1=1" );
+ if ( ad == slap_schema.si_ad_hasSubordinates ) {
+ /*
+ * instruct candidate selection algorithm
+ * and attribute list to try to detect
+ * if an entry has subordinates
+ */
+ bsi->bsi_flags |= BSQL_SF_FILTER_HASSUBORDINATE;
+
+ } else {
+ /*
+ * clear attributes to fetch, to require ALL
+ * and try extended match on all attributes
+ */
+ backsql_attrlist_add( bsi, NULL );
+ }
+ goto done;
+
+ } else {
+ at = backsql_ad2at( bsi->oc, ad );
}
if ( at == NULL ) {
Debug( LDAP_DEBUG_TRACE, "backsql_process_filter(): "
"attribute '%s' is not defined for objectclass '%s'\n",
- ad->ad_cname.bv_val, bsi->oc->name.bv_val, 0 );
- backsql_strfcat( &bsi->flt_where, &bsi->fwhere_len, "l",
- (ber_len_t)sizeof( " 1=0 " ) - 1, " 1=0 " );
+ ad->ad_cname.bv_val, BACKSQL_OC_NAME( bsi->oc ), 0 );
+ backsql_strfcat( &bsi->flt_where, "l",
+ (ber_len_t)sizeof( "1=0" ) - 1, "1=0" );
goto impossible;
}
- backsql_merge_from_clause( &bsi->from, &bsi->from_len,
- &at->from_tbls );
+ backsql_merge_from_clause( &bsi->from, &at->from_tbls );
/*
* need to add this attribute to list of attrs to load,
* so that we could do test_filter() later
backsql_attrlist_add( bsi, ad );
if ( at->join_where.bv_val != NULL
- && strstr( bsi->join_where.bv_val, at->join_where.bv_val ) == NULL ) {
- backsql_strfcat( &bsi->join_where, &bsi->jwhere_len, "lb",
+ && strstr( bsi->join_where.bb_val.bv_val, at->join_where.bv_val ) == NULL ) {
+ backsql_strfcat( &bsi->join_where, "lb",
(ber_len_t)sizeof( " AND " ) - 1, " AND ",
&at->join_where );
}
-#if 0
- /*
- * FIXME: this is not required any more; however, note that
- * attribute name syntax might collide with SQL legal aliases
- */
- if ( at != &oc_attr ) {
- backsql_strfcat( &bsi->sel, &bsi->sel_len, "cblb",
- ',',
- &at->sel_expr,
- (ber_len_t)sizeof( " AS " ) - 1, " AS ",
- &at->name );
- }
-#endif
-
switch ( f->f_choice ) {
case LDAP_FILTER_EQUALITY:
+ filter_value = &f->f_av_value;
+ matching_rule = ad->ad_type->sat_equality;
+
+ goto equality_match;
+
+ /* fail over into next case */
+
+ case LDAP_FILTER_EXT:
+ filter_value = &f->f_mra->ma_value;
+ matching_rule = f->f_mr_rule;
+
+equality_match:;
+ if ( SLAP_MR_ASSOCIATED( matching_rule,
+ bi->bi_caseIgnoreMatch ) ) {
+ casefold = 1;
+ }
+
/*
* maybe we should check type of at->sel_expr here somehow,
* to know whether upper_func is applicable, but for now
* upper_func stuff is made for Oracle, where UPPER is
* safely applicable to NUMBER etc.
*/
- if ( bsi->bi->upper_func.bv_val ) {
+ if ( casefold && bi->upper_func.bv_val ) {
size_t start;
if ( at->sel_expr_u.bv_val ) {
- backsql_strfcat( &bsi->flt_where,
- &bsi->fwhere_len, "cbl",
+ backsql_strfcat( &bsi->flt_where, "cbl",
'(',
&at->sel_expr_u,
(ber_len_t)sizeof( "='" ) - 1,
"='" );
} else {
- backsql_strfcat( &bsi->flt_where,
- &bsi->fwhere_len, "cbcbl",
+ backsql_strfcat( &bsi->flt_where, "cbcbl",
'(' /* ) */ ,
- &bsi->bi->upper_func,
+ &bi->upper_func,
'(' /* ) */ ,
&at->sel_expr,
(ber_len_t)sizeof( /* ( */ ")='" ) - 1,
/* ( */ ")='" );
}
- start = bsi->flt_where.bv_len;
+ start = bsi->flt_where.bb_val.bv_len;
- backsql_strfcat( &bsi->flt_where, &bsi->fwhere_len,
- "bl",
- &f->f_av_value,
+ backsql_strfcat( &bsi->flt_where, "bl",
+ filter_value,
(ber_len_t)sizeof( /* (' */ "')" ) - 1,
/* (' */ "')" );
- ldap_pvt_str2upper( &bsi->flt_where.bv_val[ start ] );
+ ldap_pvt_str2upper( &bsi->flt_where.bb_val.bv_val[ start ] );
} else {
- backsql_strfcat( &bsi->flt_where, &bsi->fwhere_len,
- "cblbl",
+ backsql_strfcat( &bsi->flt_where, "cblbl",
'(',
&at->sel_expr,
(ber_len_t)sizeof( "='" ) - 1, "='",
- &f->f_av_value,
+ filter_value,
(ber_len_t)sizeof( /* (' */ "')" ) - 1,
/* (' */ "')" );
}
break;
case LDAP_FILTER_GE:
- backsql_strfcat( &bsi->flt_where, &bsi->fwhere_len, "cblbc",
- '(' /* ) */ ,
- &at->sel_expr,
- (ber_len_t)sizeof( ">=" ) - 1, ">=",
- &f->f_av_value,
- /* ( */ ')' );
- break;
+ ordering.bv_val = ">=";
+
+ /* fall thru to next case */
case LDAP_FILTER_LE:
- backsql_strfcat( &bsi->flt_where, &bsi->fwhere_len, "cblbc",
- '(' /* ) */ ,
- &at->sel_expr,
- (ber_len_t)sizeof( "<=" ) - 1, "<=",
- &f->f_av_value,
- /* ( */ ')' );
+ if ( SLAP_MR_ASSOCIATED( ad->ad_type->sat_ordering,
+ bi->bi_caseIgnoreMatch ) ) {
+ casefold = 1;
+ }
+
+ /*
+ * FIXME: should we uppercase the operands?
+ */
+ if ( casefold && bi->upper_func.bv_val ) {
+ size_t start;
+
+ if ( at->sel_expr_u.bv_val ) {
+ backsql_strfcat( &bsi->flt_where, "cbbc",
+ '(',
+ &at->sel_expr_u,
+ &ordering,
+ '\'' );
+ } else {
+ backsql_strfcat( &bsi->flt_where, "cbcbcbc",
+ '(' /* ) */ ,
+ &bi->upper_func,
+ '(' /* ) */ ,
+ &at->sel_expr,
+ /* ( */ ')',
+ &ordering,
+ '\'' );
+ }
+
+ start = bsi->flt_where.bb_val.bv_len;
+
+ backsql_strfcat( &bsi->flt_where, "bl",
+ filter_value,
+ (ber_len_t)sizeof( /* (' */ "')" ) - 1,
+ /* (' */ "')" );
+
+ ldap_pvt_str2upper( &bsi->flt_where.bb_val.bv_val[ start ] );
+
+ } else {
+ backsql_strfcat( &bsi->flt_where, "cbbcbl",
+ '(' /* ) */ ,
+ &at->sel_expr,
+ &ordering,
+ '\'',
+ &f->f_av_value,
+ (ber_len_t)sizeof( /* (' */ "')" ) - 1,
+ /* ( */ "')" );
+ }
break;
case LDAP_FILTER_PRESENT:
- backsql_strfcat( &bsi->flt_where, &bsi->fwhere_len, "lbl",
+ backsql_strfcat( &bsi->flt_where, "lbl",
(ber_len_t)sizeof( "NOT (" ) - 1, "NOT (",
&at->sel_expr,
(ber_len_t)sizeof( " IS NULL)" ) - 1, " IS NULL)" );
case LDAP_FILTER_SUBSTRINGS:
backsql_process_sub_filter( bsi, f );
break;
+
+ case LDAP_FILTER_APPROX:
+ /* we do our best */
+
+ /*
+ * maybe we should check type of at->sel_expr here somehow,
+ * to know whether upper_func is applicable, but for now
+ * upper_func stuff is made for Oracle, where UPPER is
+ * safely applicable to NUMBER etc.
+ */
+ if ( bi->upper_func.bv_val ) {
+ size_t start;
+
+ if ( at->sel_expr_u.bv_val ) {
+ backsql_strfcat( &bsi->flt_where, "cbl",
+ '(',
+ &at->sel_expr_u,
+ (ber_len_t)sizeof( " LIKE '%" ) - 1,
+ " LIKE '%" );
+ } else {
+ backsql_strfcat( &bsi->flt_where, "cbcbl",
+ '(' /* ) */ ,
+ &bi->upper_func,
+ '(' /* ) */ ,
+ &at->sel_expr,
+ (ber_len_t)sizeof( /* ( */ ") LIKE '%" ) - 1,
+ /* ( */ ") LIKE '%" );
+ }
+
+ start = bsi->flt_where.bb_val.bv_len;
+
+ backsql_strfcat( &bsi->flt_where, "bl",
+ &f->f_av_value,
+ (ber_len_t)sizeof( /* (' */ "%')" ) - 1,
+ /* (' */ "%')" );
+
+ ldap_pvt_str2upper( &bsi->flt_where.bb_val.bv_val[ start ] );
+
+ } else {
+ backsql_strfcat( &bsi->flt_where, "cblbl",
+ '(',
+ &at->sel_expr,
+ (ber_len_t)sizeof( " LIKE '%" ) - 1,
+ " LIKE '%",
+ &f->f_av_value,
+ (ber_len_t)sizeof( /* (' */ "%')" ) - 1,
+ /* (' */ "%')" );
+ }
+ break;
+
+ default:
+ /* unhandled filter type; should not happen */
+ assert( 0 );
+ backsql_strfcat( &bsi->flt_where, "l",
+ (ber_len_t)sizeof( "1=1" ) - 1, "1=1" );
+ break;
+
}
done:
static int
backsql_srch_query( backsql_srch_info *bsi, struct berval *query )
{
- backsql_info *bi = (backsql_info *)bsi->be->be_private;
- ber_len_t q_len = 0;
+ backsql_info *bi = (backsql_info *)bsi->op->o_bd->be_private;
int rc;
assert( query );
query->bv_len = 0;
Debug( LDAP_DEBUG_TRACE, "==>backsql_srch_query()\n", 0, 0, 0 );
- bsi->sel.bv_val = NULL;
- bsi->sel.bv_len = 0;
- bsi->sel_len = 0;
- bsi->from.bv_val = NULL;
- bsi->from.bv_len = 0;
- bsi->from_len = 0;
- bsi->join_where.bv_val = NULL;
- bsi->join_where.bv_len = 0;
- bsi->jwhere_len = 0;
- bsi->flt_where.bv_val = NULL;
- bsi->flt_where.bv_len = 0;
- bsi->fwhere_len = 0;
-
-#if 0
- /*
- * FIXME: this query has been split in case a string cast function
- * is defined; more sophisticated (pattern based) function should
- * be used
- */
- backsql_strcat( &bsi->sel, &bsi->sel_len,
- "SELECT DISTINCT ldap_entries.id,",
- bsi->oc->keytbl.bv_val, ".", bsi->oc->keycol.bv_val,
- ",'", bsi->oc->name.bv_val, "' AS objectClass",
- ",ldap_entries.dn AS dn", NULL );
-#endif
-
- backsql_strfcat( &bsi->sel, &bsi->sel_len, "lbcbc",
+ bsi->sel.bb_val.bv_val = NULL;
+ bsi->sel.bb_val.bv_len = 0;
+ bsi->sel.bb_len = 0;
+ bsi->from.bb_val.bv_val = NULL;
+ bsi->from.bb_val.bv_len = 0;
+ bsi->from.bb_len = 0;
+ bsi->join_where.bb_val.bv_val = NULL;
+ bsi->join_where.bb_val.bv_len = 0;
+ bsi->join_where.bb_len = 0;
+ bsi->flt_where.bb_val.bv_val = NULL;
+ bsi->flt_where.bb_val.bv_len = 0;
+ bsi->flt_where.bb_len = 0;
+
+ backsql_strfcat( &bsi->sel, "lbcbc",
(ber_len_t)sizeof( "SELECT DISTINCT ldap_entries.id," ) - 1,
"SELECT DISTINCT ldap_entries.id,",
&bsi->oc->keytbl,
',' );
if ( bi->strcast_func.bv_val ) {
- backsql_strfcat( &bsi->sel, &bsi->sel_len, "blbl",
+ backsql_strfcat( &bsi->sel, "blbl",
&bi->strcast_func,
(ber_len_t)sizeof( "('" /* ') */ ) - 1,
"('" /* ') */ ,
- &bsi->oc->name,
+ &bsi->oc->oc->soc_cname,
(ber_len_t)sizeof( /* (' */ "')" ) - 1,
/* (' */ "')" );
} else {
- backsql_strfcat( &bsi->sel, &bsi->sel_len, "cbc",
+ backsql_strfcat( &bsi->sel, "cbc",
'\'',
- &bsi->oc->name,
+ &bsi->oc->oc->soc_cname,
'\'' );
}
- backsql_strfcat( &bsi->sel, &bsi->sel_len, "l",
+ backsql_strfcat( &bsi->sel, "l",
(ber_len_t)sizeof( " AS objectClass,ldap_entries.dn AS dn" ) - 1,
" AS objectClass,ldap_entries.dn AS dn" );
- backsql_strfcat( &bsi->from, &bsi->from_len, "lb",
+ backsql_strfcat( &bsi->from, "lb",
(ber_len_t)sizeof( " FROM ldap_entries," ) - 1,
" FROM ldap_entries,",
&bsi->oc->keytbl );
- backsql_strfcat( &bsi->join_where, &bsi->jwhere_len, "lbcbl",
+ backsql_strfcat( &bsi->join_where, "lbcbl",
(ber_len_t)sizeof( " WHERE " ) - 1, " WHERE ",
&bsi->oc->keytbl,
'.',
switch ( bsi->scope ) {
case LDAP_SCOPE_BASE:
- if ( bsi->bi->upper_func.bv_val ) {
- backsql_strfcat( &bsi->join_where, &bsi->jwhere_len,
- "blbcb",
- &bsi->bi->upper_func,
+ if ( bi->upper_func.bv_val ) {
+ backsql_strfcat( &bsi->join_where, "blbcb",
+ &bi->upper_func,
(ber_len_t)sizeof( "(ldap_entries.dn)=" ) - 1,
"(ldap_entries.dn)=",
- &bsi->bi->upper_func_open,
+ &bi->upper_func_open,
'?',
- &bsi->bi->upper_func_close );
+ &bi->upper_func_close );
} else {
- backsql_strfcat( &bsi->join_where, &bsi->jwhere_len,
- "l",
+ backsql_strfcat( &bsi->join_where, "l",
(ber_len_t)sizeof( "ldap_entries.dn=?" ) - 1,
"ldap_entries.dn=?" );
}
break;
case LDAP_SCOPE_ONELEVEL:
- backsql_strfcat( &bsi->join_where, &bsi->jwhere_len, "l",
+ backsql_strfcat( &bsi->join_where, "l",
(ber_len_t)sizeof( "ldap_entries.parent=?" ) - 1,
"ldap_entries.parent=?" );
break;
case LDAP_SCOPE_SUBTREE:
- backsql_strfcat( &bsi->join_where, &bsi->jwhere_len, "b",
- &bsi->bi->subtree_cond );
+ if ( bi->upper_func.bv_val ) {
+ backsql_strfcat( &bsi->join_where, "blbcb",
+ &bi->upper_func,
+ (ber_len_t)sizeof( "(ldap_entries.dn) LIKE " ) - 1,
+ "(ldap_entries.dn) LIKE ",
+ &bi->upper_func_open,
+ '?',
+ &bi->upper_func_close );
+ } else {
+ backsql_strfcat( &bsi->join_where, "l",
+ (ber_len_t)sizeof( "ldap_entries.dn LIKE ?" ) - 1,
+ "ldap_entries.dn LIKE ?" );
+ }
+
break;
default:
rc = backsql_process_filter( bsi, bsi->filter );
if ( rc > 0 ) {
- backsql_strfcat( query, &q_len, "bbblb",
- &bsi->sel,
- &bsi->from,
- &bsi->join_where,
+ struct berbuf bb = BB_NULL;
+
+ backsql_strfcat( &bb, "bbblb",
+ &bsi->sel.bb_val,
+ &bsi->from.bb_val,
+ &bsi->join_where.bb_val,
(ber_len_t)sizeof( " AND " ) - 1, " AND ",
- &bsi->flt_where );
+ &bsi->flt_where.bb_val );
+
+ *query = bb.bb_val;
} else if ( rc < 0 ) {
/*
* Indicates that there's no possible way the filter matches
* anything. No need to issue the query
*/
- Debug( LDAP_DEBUG_TRACE,
- "<==backsql_srch_query() returns NULL\n", 0, 0, 0 );
free( query->bv_val );
query->bv_val = NULL;
}
- free( bsi->sel.bv_val );
- bsi->sel.bv_len = 0;
- bsi->sel_len = 0;
- free( bsi->from.bv_val );
- bsi->from.bv_len = 0;
- bsi->from_len = 0;
- free( bsi->join_where.bv_val );
- bsi->join_where.bv_len = 0;
- bsi->jwhere_len = 0;
- free( bsi->flt_where.bv_val );
- bsi->flt_where.bv_len = 0;
- bsi->fwhere_len = 0;
+ free( bsi->sel.bb_val.bv_val );
+ bsi->sel.bb_val.bv_len = 0;
+ bsi->sel.bb_len = 0;
+ free( bsi->from.bb_val.bv_val );
+ bsi->from.bb_val.bv_len = 0;
+ bsi->from.bb_len = 0;
+ free( bsi->join_where.bb_val.bv_val );
+ bsi->join_where.bb_val.bv_len = 0;
+ bsi->join_where.bb_len = 0;
+ free( bsi->flt_where.bb_val.bv_val );
+ bsi->flt_where.bb_val.bv_len = 0;
+ bsi->flt_where.bb_len = 0;
- Debug( LDAP_DEBUG_TRACE, "<==backsql_srch_query()\n", 0, 0, 0 );
+ Debug( LDAP_DEBUG_TRACE, "<==backsql_srch_query() returns %s\n",
+ query->bv_val ? query->bv_val : "NULL", 0, 0 );
- return ( query->bv_val == NULL ? 1 : 0 );
+ return ( rc <= 0 ? 1 : 0 );
}
-int
-backsql_oc_get_candidates( backsql_oc_map_rec *oc, backsql_srch_info *bsi )
+static int
+backsql_oc_get_candidates( void *v_oc, void *v_bsi )
{
+ backsql_oc_map_rec *oc = v_oc;
+ backsql_srch_info *bsi = v_bsi;
+ backsql_info *bi = (backsql_info *)bsi->op->o_bd->be_private;
struct berval query;
SQLHSTMT sth;
RETCODE rc;
BACKSQL_ROW_NTS row;
int i;
int j;
+
+ int n_candidates = bsi->n_candidates;
+
+ bsi->status = LDAP_SUCCESS;
Debug( LDAP_DEBUG_TRACE, "==>backsql_oc_get_candidates(): oc='%s'\n",
- oc->name.bv_val, 0, 0 );
+ BACKSQL_OC_NAME( oc ), 0, 0 );
if ( bsi->n_candidates == -1 ) {
Debug( LDAP_DEBUG_TRACE, "backsql_oc_get_candidates(): "
"unchecked limit has been overcome\n", 0, 0, 0 );
- return 1;
+ /* should never get here */
+ assert( 0 );
+ bsi->status = LDAP_ADMINLIMIT_EXCEEDED;
+ return BACKSQL_STOP;
}
bsi->oc = oc;
- if ( backsql_srch_query( bsi, &query ) ) {
+ res = backsql_srch_query( bsi, &query );
+ if ( res ) {
Debug( LDAP_DEBUG_TRACE, "backsql_oc_get_candidates(): "
- "could not construct query for objectclass\n",
- 0, 0, 0 );
- return 1;
+ "error while constructing query for objectclass '%s'\n",
+ oc->oc->soc_cname.bv_val, 0, 0 );
+ /*
+ * FIXME: need to separate errors from legally
+ * impossible filters
+ */
+ bsi->status = LDAP_SUCCESS;
+ return BACKSQL_CONTINUE;
+ }
+
+ if ( query.bv_val == NULL ) {
+ Debug( LDAP_DEBUG_TRACE, "backsql_oc_get_candidates(): "
+ "could not construct query for objectclass '%s'\n",
+ oc->oc->soc_cname.bv_val, 0, 0 );
+ bsi->status = LDAP_SUCCESS;
+ return BACKSQL_CONTINUE;
}
Debug( LDAP_DEBUG_TRACE, "Constructed query: %s\n",
if ( rc != SQL_SUCCESS ) {
Debug( LDAP_DEBUG_TRACE, "backsql_oc_get_candidates(): "
"error preparing query\n", 0, 0, 0 );
- backsql_PrintErrors( bsi->bi->db_env, bsi->dbh, sth, rc );
- return 1;
+ backsql_PrintErrors( bi->db_env, bsi->dbh, sth, rc );
+ bsi->status = LDAP_OTHER;
+ return BACKSQL_CONTINUE;
}
+
+ Debug( LDAP_DEBUG_TRACE, "id: '%ld'\n", bsi->oc->id, 0, 0 );
if ( backsql_BindParamID( sth, 1, &bsi->oc->id ) != SQL_SUCCESS ) {
Debug( LDAP_DEBUG_TRACE, "backsql_oc_get_candidates(): "
"error binding objectclass id parameter\n", 0, 0, 0 );
- return 1;
+ bsi->status = LDAP_OTHER;
+ return BACKSQL_CONTINUE;
}
switch ( bsi->scope ) {
case LDAP_SCOPE_BASE:
+ Debug( LDAP_DEBUG_TRACE, "(base)dn: '%s'\n",
+ bsi->base_dn->bv_val, 0, 0 );
+
rc = backsql_BindParamStr( sth, 2, bsi->base_dn->bv_val,
BACKSQL_MAX_DN_LEN );
if ( rc != SQL_SUCCESS ) {
Debug( LDAP_DEBUG_TRACE, "backsql_oc_get_candidates(): "
"error binding base_dn parameter\n", 0, 0, 0 );
- backsql_PrintErrors( bsi->bi->db_env, bsi->dbh,
+ backsql_PrintErrors( bi->db_env, bsi->dbh,
sth, rc );
- return 1;
+ bsi->status = LDAP_OTHER;
+ return BACKSQL_CONTINUE;
}
break;
* If "dn" is being used, do a suffix search.
* If "dn_ru" is being used, do a prefix search.
*/
- if ( BACKSQL_HAS_LDAPINFO_DN_RU( bsi->bi ) ) {
+ if ( BACKSQL_HAS_LDAPINFO_DN_RU( bi ) ) {
temp_base_dn[ 0 ] = '\0';
for ( i = 0, j = bsi->base_dn->bv_len - 1;
j >= 0; i++, j--) {
}
temp_base_dn[ i ] = '%';
temp_base_dn[ i + 1 ] = '\0';
- ldap_pvt_str2upper( temp_base_dn );
} else {
temp_base_dn[ 0 ] = '%';
AC_MEMCPY( &temp_base_dn[ 1 ], bsi->base_dn->bv_val,
bsi->base_dn->bv_len + 1 );
- ldap_pvt_str2upper( &temp_base_dn[ 1 ] );
}
+ ldap_pvt_str2upper( temp_base_dn );
- Debug( LDAP_DEBUG_TRACE, "dn '%s'\n", temp_base_dn, 0, 0 );
+ Debug( LDAP_DEBUG_TRACE, "(sub)dn: '%s'\n", temp_base_dn,
+ 0, 0 );
rc = backsql_BindParamStr( sth, 2, temp_base_dn,
BACKSQL_MAX_DN_LEN );
Debug( LDAP_DEBUG_TRACE, "backsql_oc_get_candidates(): "
"error binding base_dn parameter (2)\n",
0, 0, 0 );
- backsql_PrintErrors( bsi->bi->db_env, bsi->dbh,
+ backsql_PrintErrors( bi->db_env, bsi->dbh,
sth, rc );
- return 1;
+ bsi->status = LDAP_OTHER;
+ return BACKSQL_CONTINUE;
}
break;
}
case LDAP_SCOPE_ONELEVEL:
- res = backsql_dn2id( bsi->bi, &base_id,
+ res = backsql_dn2id( bi, &base_id,
bsi->dbh, bsi->base_dn );
if ( res != LDAP_SUCCESS ) {
Debug( LDAP_DEBUG_TRACE, "backsql_oc_get_candidates(): "
res == LDAP_NO_SUCH_OBJECT ? ": no such entry"
: "", 0, 0 );
bsi->status = res;
- return 0;
+ return BACKSQL_CONTINUE;
}
+ Debug( LDAP_DEBUG_TRACE, "(one)id: '%s'\n", base_id.id,
+ 0, 0 );
+
rc = backsql_BindParamID( sth, 2, &base_id.id );
backsql_free_entryID( &base_id, 0 );
if ( rc != SQL_SUCCESS ) {
Debug( LDAP_DEBUG_TRACE, "backsql_oc_get_candidates(): "
"error binding base id parameter\n", 0, 0, 0 );
- return 1;
+ bsi->status = LDAP_OTHER;
+ return BACKSQL_CONTINUE;
}
break;
}
if ( !BACKSQL_SUCCESS( rc ) ) {
Debug( LDAP_DEBUG_TRACE, "backsql_oc_get_candidates(): "
"error executing query\n", 0, 0, 0 );
- backsql_PrintErrors( bsi->bi->db_env, bsi->dbh, sth, rc );
+ backsql_PrintErrors( bi->db_env, bsi->dbh, sth, rc );
SQLFreeStmt( sth, SQL_DROP );
- return 1;
+ bsi->status = LDAP_OTHER;
+ return BACKSQL_CONTINUE;
}
backsql_BindRowAsStrings( sth, &row );
backsql_FreeRow( &row );
SQLFreeStmt( sth, SQL_DROP );
- Debug( LDAP_DEBUG_TRACE, "<==backsql_oc_get_candidates()\n", 0, 0, 0 );
+ Debug( LDAP_DEBUG_TRACE, "<==backsql_oc_get_candidates(): %d\n",
+ n_candidates - bsi->n_candidates, 0, 0 );
- return 1;
+ return ( bsi->n_candidates == -1 ? BACKSQL_STOP : BACKSQL_CONTINUE );
}
int
-backsql_search(
- BackendDB *be,
- Connection *conn,
- Operation *op,
- struct berval *base,
- struct berval *nbase,
- int scope,
- int deref,
- int slimit,
- int tlimit,
- Filter *filter,
- struct berval *filterstr,
- AttributeName *attrs,
- int attrsonly )
+backsql_search( Operation *op, SlapReply *rs )
{
- backsql_info *bi = (backsql_info *)be->be_private;
+ backsql_info *bi = (backsql_info *)op->o_bd->be_private;
SQLHDBC dbh;
int sres;
- int nentries;
Entry *entry, *res;
- int manageDSAit = get_manageDSAit( op );
- BerVarray v2refs = NULL;
+ int manageDSAit;
time_t stoptime = 0;
backsql_srch_info srch_info;
backsql_entryID *eid = NULL;
struct slap_limits_set *limit = NULL;
int isroot = 0;
+ manageDSAit = get_manageDSAit( op );
+
Debug( LDAP_DEBUG_TRACE, "==>backsql_search(): "
"base='%s', filter='%s', scope=%d,",
- nbase->bv_val, filterstr->bv_val, scope );
+ op->o_req_ndn.bv_val,
+ op->oq_search.rs_filterstr.bv_val,
+ op->oq_search.rs_scope );
Debug( LDAP_DEBUG_TRACE, " deref=%d, attrsonly=%d, "
"attributes to load: %s\n",
- deref, attrsonly, attrs == NULL ? "all" : "custom list" );
+ op->oq_search.rs_deref,
+ op->oq_search.rs_attrsonly,
+ op->oq_search.rs_attrs == NULL ? "all" : "custom list" );
- if ( nbase->bv_len > BACKSQL_MAX_DN_LEN ) {
+ if ( op->o_req_ndn.bv_len > BACKSQL_MAX_DN_LEN ) {
Debug( LDAP_DEBUG_TRACE, "backsql_search(): "
"search base length (%ld) exceeds max length (%ld)\n",
- nbase->bv_len, BACKSQL_MAX_DN_LEN, 0 );
+ op->o_req_ndn.bv_len, BACKSQL_MAX_DN_LEN, 0 );
/*
* FIXME: a LDAP_NO_SUCH_OBJECT could be appropriate
* since it is impossible that such a long DN exists
* in the backend
*/
- send_ldap_result( conn, op, LDAP_ADMINLIMIT_EXCEEDED,
- "", NULL, NULL, NULL );
+ rs->sr_err = LDAP_ADMINLIMIT_EXCEEDED;
+ send_ldap_result( op, rs );
return 1;
}
- sres = backsql_get_db_conn( be, conn, &dbh );
+ sres = backsql_get_db_conn( op, &dbh );
if ( sres != LDAP_SUCCESS ) {
Debug( LDAP_DEBUG_TRACE, "backsql_search(): "
"could not get connection handle - exiting\n",
0, 0, 0 );
- send_ldap_result( conn, op, sres, "",
- sres == LDAP_OTHER ? "SQL-backend error" : "",
- NULL, NULL );
+ rs->sr_err = sres;
+ rs->sr_text = sres == LDAP_OTHER ? "SQL-backend error" : NULL;
+ send_ldap_result( op, rs );
return 1;
}
- /* TimesTen : Pass it along to the lower level routines */
- srch_info.use_reverse_dn = BACKSQL_USE_REVERSE_DN( bi );
-
/* if not root, get appropriate limits */
- if ( be_isroot( be, &op->o_ndn ) ) {
+ if ( be_isroot( op->o_bd, &op->o_ndn ) ) {
isroot = 1;
} else {
- ( void ) get_limits( be, &op->o_ndn, &limit );
+ ( void ) get_limits( op->o_bd, &op->o_ndn, &limit );
}
/* The time/size limits come first because they require very little
/* if no time limit requested, use soft limit (unless root!) */
if ( isroot ) {
- if ( tlimit == 0 ) {
- tlimit = -1; /* allow root to set no limit */
+ if ( op->oq_search.rs_tlimit == 0 ) {
+ op->oq_search.rs_tlimit = -1; /* allow root to set no limit */
}
- if ( slimit == 0 ) {
- slimit = -1;
+ if ( op->oq_search.rs_slimit == 0 ) {
+ op->oq_search.rs_slimit = -1;
}
} else {
/* if no limit is required, use soft limit */
- if ( tlimit <= 0 ) {
- tlimit = limit->lms_t_soft;
+ 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 ( tlimit > limit->lms_t_hard ) {
+ } else if ( op->oq_search.rs_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;
+ 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_search_result( conn, op,
- LDAP_UNWILLING_TO_PERFORM,
- NULL, NULL, NULL, NULL, 0 );
+ rs->sr_err = LDAP_ADMINLIMIT_EXCEEDED;
+ send_ldap_result( op, rs );
return 0;
}
}
/* if no limit is required, use soft limit */
- if ( slimit <= 0 ) {
- slimit = limit->lms_s_soft;
+ 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 ( slimit > limit->lms_s_hard ) {
+ } else if ( op->oq_search.rs_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;
+ 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_search_result( conn, op,
- LDAP_UNWILLING_TO_PERFORM,
- NULL, NULL, NULL, NULL, 0 );
+ rs->sr_err = LDAP_ADMINLIMIT_EXCEEDED;
+ send_ldap_result( op, rs );
return 0;
}
}
/* compute it anyway; root does not use it */
- stoptime = op->o_time + tlimit;
+ stoptime = op->o_time + op->oq_search.rs_tlimit;
- backsql_init_search( &srch_info, bi, nbase, scope,
- slimit, tlimit, stoptime, filter, dbh,
- be, conn, op, attrs );
+ backsql_init_search( &srch_info, &op->o_req_dn,
+ op->oq_search.rs_scope,
+ op->oq_search.rs_slimit, op->oq_search.rs_tlimit,
+ stoptime, op->oq_search.rs_filter,
+ dbh, op, op->oq_search.rs_attrs );
/*
* for each objectclass we try to construct query which gets IDs
*/
srch_info.n_candidates = ( isroot ? -2 : limit->lms_s_unchecked == -1
? -2 : limit->lms_s_unchecked );
- avl_apply( bi->oc_by_oc, (AVL_APPLY)backsql_oc_get_candidates,
- &srch_info, 0, AVL_INORDER );
+ avl_apply( bi->oc_by_oc, backsql_oc_get_candidates,
+ &srch_info, BACKSQL_STOP, AVL_INORDER );
if ( !isroot && limit->lms_s_unchecked != -1 ) {
if ( srch_info.n_candidates == -1 ) {
- send_search_result( conn, op,
- LDAP_ADMINLIMIT_EXCEEDED,
- NULL, NULL, NULL, NULL, 0 );
+ rs->sr_err = LDAP_ADMINLIMIT_EXCEEDED;
+ send_ldap_result( op, rs );
goto done;
}
}
- nentries = 0;
/*
* now we load candidate entries (only those attributes
* mentioned in attrs and filter), test it against full filter
*/
for ( eid = srch_info.id_list; eid != NULL;
eid = backsql_free_entryID( eid, 1 ) ) {
+ Attribute *hasSubordinate = NULL,
+ *a = NULL;
/* check for abandon */
if ( op->o_abandon ) {
}
/* check time limit */
- if ( tlimit != -1 && slap_get_time() > stoptime ) {
- send_search_result( conn, op, LDAP_TIMELIMIT_EXCEEDED,
- NULL, NULL, v2refs, NULL, nentries );
+ if ( op->oq_search.rs_tlimit != -1 && slap_get_time() > stoptime ) {
+ rs->sr_err = LDAP_TIMELIMIT_EXCEEDED;
+ rs->sr_ctrls = NULL;
+ rs->sr_ref = rs->sr_v2ref;
+ rs->sr_err = (rs->sr_v2ref == NULL) ? LDAP_SUCCESS
+ : LDAP_REFERRAL;
+ send_ldap_result( op, rs );
goto end_of_search;
}
continue;
}
- if ( !manageDSAit && scope != LDAP_SCOPE_BASE &&
- is_entry_referral( entry ) ) {
- BerVarray refs = get_entry_referrals( be, conn,
- op, entry );
+ if ( !manageDSAit &&
+ op->oq_search.rs_scope != LDAP_SCOPE_BASE &&
+ is_entry_referral( entry ) ) {
+ BerVarray refs;
+ struct berval matched_dn;
+
+ ber_dupbv( &matched_dn, &entry->e_name );
+ refs = get_entry_referrals( op, entry );
+ if ( refs ) {
+ rs->sr_ref = referral_rewrite( refs,
+ &matched_dn, &op->o_req_dn,
+ op->oq_search.rs_scope );
+ ber_bvarray_free( refs );
+ }
+
+ if (!rs->sr_ref) {
+ rs->sr_text = "bad_referral object";
+ }
+
+ rs->sr_err = LDAP_REFERRAL;
+ rs->sr_matched = matched_dn.bv_val;
+ send_search_reference( op, rs );
+
+ ber_bvarray_free( rs->sr_ref );
+ rs->sr_ref = NULL;
+ ber_memfree( matched_dn.bv_val );
+ rs->sr_matched = NULL;
- send_search_reference( be, conn, op, entry, refs,
- NULL, &v2refs );
- ber_bvarray_free( refs );
continue;
}
- if ( test_filter( be, conn, op, entry, filter )
+ /*
+ * We use this flag since we need to parse the filter
+ * anyway; we should have used the frontend API function
+ * filter_has_subordinates()
+ */
+ if ( srch_info.bsi_flags & BSQL_SF_FILTER_HASSUBORDINATE ) {
+ int rc;
+
+ rc = backsql_has_children( bi, dbh, &entry->e_nname );
+
+ switch( rc ) {
+ case LDAP_COMPARE_TRUE:
+ case LDAP_COMPARE_FALSE:
+ hasSubordinate = slap_operational_hasSubordinate( rc == LDAP_COMPARE_TRUE );
+ if ( hasSubordinate != NULL ) {
+ for ( a = entry->e_attrs;
+ a && a->a_next;
+ a = a->a_next );
+
+ a->a_next = hasSubordinate;
+ }
+ rc = 0;
+ break;
+
+ default:
+ Debug(LDAP_DEBUG_TRACE,
+ "backsql_search(): "
+ "has_children failed( %d)\n",
+ rc, 0, 0 );
+ rc = 1;
+ break;
+ }
+
+ if ( rc ) {
+ continue;
+ }
+ }
+
+ if ( test_filter( op, entry, op->oq_search.rs_filter )
== LDAP_COMPARE_TRUE ) {
- sres = send_search_entry( be, conn, op, entry,
- attrs, attrsonly, NULL );
+ if ( hasSubordinate && !( srch_info.bsi_flags & BSQL_SF_ALL_OPER )
+ && !ad_inlist( slap_schema.si_ad_hasSubordinates, op->oq_search.rs_attrs ) ) {
+ a->a_next = NULL;
+ attr_free( hasSubordinate );
+ hasSubordinate = NULL;
+ }
+
+#if 0 /* noop is masked SLAP_CTRL_UPDATE */
+ if ( op->o_noop ) {
+ sres = 0;
+ } else {
+#endif
+ rs->sr_attrs = op->oq_search.rs_attrs;
+ rs->sr_entry = entry;
+ sres = send_search_entry( op, rs );
+ rs->sr_entry = NULL;
+ rs->sr_attrs = NULL;
+#if 0
+ }
+#endif
+
switch ( sres ) {
case 0:
- nentries++;
break;
case -1:
}
entry_free( entry );
- if ( slimit != -1 && nentries >= slimit ) {
- send_search_result( conn, op, LDAP_SIZELIMIT_EXCEEDED,
- NULL, NULL, v2refs, NULL, nentries );
+ if ( op->oq_search.rs_slimit != -1
+ && rs->sr_nentries >= op->oq_search.rs_slimit ) {
+ rs->sr_err = LDAP_SIZELIMIT_EXCEEDED;
+ send_ldap_result( op, rs );
goto end_of_search;
}
}
end_of_search:;
- if ( nentries > 0 ) {
- send_search_result( conn, op,
- v2refs == NULL ? LDAP_SUCCESS : LDAP_REFERRAL,
- NULL, NULL, v2refs, NULL, nentries );
+ if ( rs->sr_nentries > 0 ) {
+ rs->sr_ref = rs->sr_v2ref;
+ rs->sr_err = (rs->sr_v2ref == NULL) ? LDAP_SUCCESS
+ : LDAP_REFERRAL;
} else {
- send_ldap_result( conn, op, srch_info.status,
- NULL, NULL, NULL, 0 );
+ rs->sr_err = srch_info.status;
}
-
+ send_ldap_result( op, rs );
+
+ if ( rs->sr_v2ref ) {
+ ber_bvarray_free( rs->sr_v2ref );
+ rs->sr_v2ref = NULL;
+ }
+
done:;
ch_free( srch_info.attrs );
projects / openldap / blobdiff