]> git.sur5r.net Git - openldap/blobdiff - servers/slapd/back-sql/search.c
remove dnNormalize2
[openldap] / servers / slapd / back-sql / search.c
index 6bc9fefd900647ea1cd693f3cd25dde3e8a217a3..9305d45aadc047ea132a3a3585123b410e328381 100644 (file)
 
 #include <stdio.h>
 #include <sys/types.h>
-#include <string.h>
+#include "ac/string.h"
 #include "slap.h"
+#include "lber_pvt.h"
+#include "ldap_pvt.h"
 #include "back-sql.h"
 #include "sql-wrap.h"
 #include "schema-map.h"
 #include "entry-id.h"
 #include "util.h"
 
-int backsql_attrlist_add(backsql_srch_info *bsi,char *at_name)
+#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 )
 {
- char **p=bsi->attrs;
- int n_attrs=0;
-
- if (bsi->attrs==NULL)
-  return 1;
-
- while(*p)
- {
-  Debug(LDAP_DEBUG_TRACE,"==>backsql_attrlist_add(): attribute '%s' is in list\n",*p,0,0);
-  if (!strcasecmp(*p,at_name))
-   return 1;
-  n_attrs++;
-  p++;
- }
- Debug(LDAP_DEBUG_TRACE,"==>backsql_attrlist_add(): adding '%s' to list\n",at_name,0,0);
- bsi->attrs=(char**)ch_realloc(bsi->attrs,(n_attrs+2)*sizeof(char*));
- bsi->attrs[n_attrs]=ch_strdup(at_name);
- bsi->attrs[n_attrs+1]=NULL;
- return 1;
+       int             n_attrs = 0;
+       AttributeName   *an = NULL;
+
+       if ( bsi->attrs == NULL ) {
+               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 ];
+               
+               Debug( LDAP_DEBUG_TRACE, "==>backsql_attrlist_add(): "
+                       "attribute '%s' is in list\n", 
+                       an->an_name.bv_val, 0, 0 );
+               /*
+                * We can live with strcmp because the attribute 
+                * list has been normalized before calling be_search
+                */
+               if ( !BACKSQL_NCMP( &an->an_name, &ad->ad_cname ) ) {
+                       return 1;
+               }
+       }
+       
+       Debug( LDAP_DEBUG_TRACE, "==>backsql_attrlist_add(): "
+               "adding '%s' to list\n", ad->ad_cname.bv_val, 0, 0 );
+
+       an = (AttributeName *)ch_realloc( bsi->attrs,
+                       sizeof( AttributeName ) * ( n_attrs + 2 ) );
+       if ( an == NULL ) {
+               return -1;
+       }
+
+       an[ n_attrs ].an_name = ad->ad_cname;
+       an[ n_attrs ].an_desc = ad;
+       an[ n_attrs + 1 ].an_name.bv_val = NULL;
+       an[ n_attrs + 1 ].an_name.bv_len = 0;
+
+       bsi->attrs = an;
+       
+       return 1;
 }
 
-void backsql_init_search(backsql_srch_info *bsi,backsql_info *bi,char *nbase,int scope,
-                                                int slimit,int tlimit,time_t stoptime,Filter *filter,
-                                                SQLHDBC dbh,BackendDB *be,Connection *conn,Operation *op,char **attrs)
+void
+backsql_init_search(
+       backsql_srch_info       *bsi, 
+       struct berval           *base, 
+       int                     scope, 
+       int                     slimit,
+       int                     tlimit,
+       time_t                  stoptime, 
+       Filter                  *filter, 
+       SQLHDBC                 dbh,
+       Operation               *op,
+       AttributeName           *attrs )
 {
- char **p;
- bsi->base_dn=nbase;
- bsi->scope=scope;
- bsi->slimit=slimit;
- bsi->tlimit=tlimit;
- bsi->filter=filter;
- bsi->dbh=dbh;
- bsi->be=be;
- bsi->conn=conn;
- bsi->op=op;
- if (attrs!=NULL)
- {
-  bsi->attrs=(char**)ch_calloc(1,sizeof(char*));
-  bsi->attrs[0]=NULL;
-  for(p=attrs;*p!=NULL;p++)
-   backsql_attrlist_add(bsi,*p);
- }
- else
-  bsi->attrs=attrs;
- bsi->abandon=0;
- bsi->id_list=NULL;
- bsi->stoptime=stoptime;
- bsi->bi=bi;
- bsi->sel=NULL; bsi->from=NULL; bsi->join_where=NULL; bsi->flt_where=NULL;
- bsi->sel_len=0; bsi->from_len=0; bsi->jwhere_len=0; bsi->fwhere_len=0;
+       AttributeName           *p;
+       
+       bsi->base_dn = base;
+       bsi->scope = scope;
+       bsi->slimit = slimit;
+       bsi->tlimit = tlimit;
+       bsi->filter = filter;
+       bsi->dbh = dbh;
+       bsi->op = op;
+       bsi->bsi_flags = 0;
+
+       /*
+        * handle "*"
+        */
+       if ( attrs == NULL || an_find( attrs, &AllUser ) ) {
+               bsi->attrs = NULL;
+
+       } else {
+               bsi->attrs = (AttributeName *)ch_calloc( 1, 
+                               sizeof( AttributeName ) );
+               bsi->attrs[ 0 ].an_name.bv_val = NULL;
+               bsi->attrs[ 0 ].an_name.bv_len = 0;
+               
+               for ( p = attrs; p->an_name.bv_val; p++ ) {
+                       /*
+                        * 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 ) {
+                               continue;
+                       }
+
+                       backsql_attrlist_add( bsi, p->an_desc );
+               }
+       }
+
+       bsi->abandon = 0;
+       bsi->id_list = NULL;
+       bsi->n_candidates = 0;
+       bsi->stoptime = stoptime;
+       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 backsql_process_filter_list(backsql_srch_info *bsi,Filter *f,int op)
+static int
+backsql_process_filter_list( backsql_srch_info *bsi, Filter *f, int op )
 {
- char *sub_clause=NULL;
- int len=0,res;
-
- bsi->flt_where=backsql_strcat(bsi->flt_where,&bsi->fwhere_len,"(",NULL);
- while(1)
- {
-  res=backsql_process_filter(bsi,f);
-  
-  f=f->f_next;
-  if (f==NULL)
-   break;
-
-  switch (op)
-  {
-   case LDAP_FILTER_AND:
-                       bsi->flt_where=backsql_strcat(bsi->flt_where,&bsi->fwhere_len," AND ",NULL);
+       int             res;
+
+       if ( !f ) {
+               return 0;
+       }
+
+       backsql_strfcat( &bsi->flt_where, "c", '(' /* ) */  );
+
+       while ( 1 ) {
+               res = backsql_process_filter( bsi, f );
+               if ( res < 0 ) {
+                       /*
+                        * TimesTen : If the query has no answers,
+                        * don't bother to run the query.
+                        */
+                       return -1;
+               }
+               f = f->f_next;
+               if ( f == NULL ) {
                        break;
-   case LDAP_FILTER_OR:
-                       bsi->flt_where=backsql_strcat(bsi->flt_where,&bsi->fwhere_len," OR ",NULL);
+               }
+
+               switch ( op ) {
+               case LDAP_FILTER_AND:
+                       backsql_strfcat( &bsi->flt_where, "l",
+                                       (ber_len_t)sizeof( " AND " ) - 1, 
+                                               " AND " );
                        break;
-  }
- }
 
- bsi->flt_where=backsql_strcat(bsi->flt_where,&bsi->fwhere_len,")",NULL);
- return 1;
+               case LDAP_FILTER_OR:
+                       backsql_strfcat( &bsi->flt_where, "l",
+                                       (ber_len_t)sizeof( " OR " ) - 1,
+                                               " OR " );
+                       break;
+               }
+       }
+
+       backsql_strfcat( &bsi->flt_where, "c", /* ( */ ')' );
+
+       return 1;
 }
 
-int backsql_process_sub_filter(backsql_srch_info *bsi,Filter *f)
+static int
+backsql_process_sub_filter( backsql_srch_info *bsi, Filter *f )
 {
- int i;
-
- backsql_at_map_rec *at=backsql_at_with_name(bsi->oc,f->f_sub_type);
-
- bsi->flt_where=backsql_strcat(bsi->flt_where,&bsi->fwhere_len,"(",NULL);
-
- if (bsi->bi->upper_func)
- {
-  bsi->flt_where=backsql_strcat(bsi->flt_where,&bsi->fwhere_len,
-         bsi->bi->upper_func,"(",at->sel_expr,")",
-                               " LIKE '",NULL);
- }
- else
- {
-  bsi->flt_where=backsql_strcat(bsi->flt_where,&bsi->fwhere_len,at->sel_expr,
-                               " LIKE '",NULL);
- }
- if (f->f_sub_initial!=NULL)
- {
-  bsi->flt_where=backsql_strcat(bsi->flt_where,&bsi->fwhere_len,f->f_sub_initial->bv_val,NULL);
- }
-
- bsi->flt_where=backsql_strcat(bsi->flt_where,&bsi->fwhere_len,"%",NULL);
-
- if (f->f_sub_any!=NULL)
-  for(i=0;f->f_sub_any[i]!=NULL;i++)
-  {
-   //Debug(LDAP_DEBUG_TRACE,"==>backsql_process_sub_filter(): sub_any='%s'\n",f->f_sub_any[i]->bv_val,0,0);
-   bsi->flt_where=backsql_strcat(bsi->flt_where,&bsi->fwhere_len,f->f_sub_any[i]->bv_val,"%",NULL);
-  }
-
- if (f->f_sub_final!=NULL)
-  bsi->flt_where=backsql_strcat(bsi->flt_where,&bsi->fwhere_len,f->f_sub_final->bv_val,NULL);
-
- bsi->flt_where=backsql_strcat(bsi->flt_where,&bsi->fwhere_len,"')",NULL);
+       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 );
+
+       /*
+        * When dealing with case-sensitive strings 
+        * we may omit normalization; however, normalized
+        * SQL filters are more liberal.
+        */
+
+       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 ( 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, 
+                                       "bl",
+                                       &at->sel_expr_u,
+                                       (ber_len_t)sizeof( " LIKE '" ) - 1,
+                                               " LIKE '" );
+               } else {
+                       backsql_strfcat( &bsi->flt_where, 
+                                       "bcbcl",
+                                       &bi->upper_func,
+                                       '(',
+                                       &at->sel_expr,
+                                       ')', 
+                                       (ber_len_t)sizeof( " LIKE '" ) - 1,
+                                               " LIKE '" );
+               }
+       } else {
+               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.bb_val.bv_len;
+               backsql_strfcat( &bsi->flt_where, "b",
+                               &f->f_sub_initial );
+               if ( casefold && bi->upper_func.bv_val ) {
+                       ldap_pvt_str2upper( &bsi->flt_where.bb_val.bv_val[ start ] );
+               }
+       }
+
+       backsql_strfcat( &bsi->flt_where, "c", '%' );
+
+       if ( f->f_sub_any != NULL ) {
+               for ( i = 0; f->f_sub_any[ i ].bv_val != NULL; i++ ) {
+                       size_t  start;
+
+#ifdef BACKSQL_TRACE
+                       Debug( LDAP_DEBUG_TRACE, 
+                               "==>backsql_process_sub_filter(): "
+                               "sub_any='%s'\n", f->f_sub_any[ i ].bv_val,
+                               0, 0 );
+#endif /* BACKSQL_TRACE */
+
+                       start = bsi->flt_where.bb_val.bv_len;
+                       backsql_strfcat( &bsi->flt_where,
+                                       "bc",
+                                       &f->f_sub_any[ i ],
+                                       '%' );
+                       if ( casefold && bi->upper_func.bv_val ) {
+                               /*
+                                * Note: toupper('%') = '%'
+                                */
+                               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.bb_val.bv_len;
+                       backsql_strfcat( &bsi->flt_where, "b",
+                                       &f->f_sub_final );
+                       if ( casefold && bi->upper_func.bv_val ) {
+                               ldap_pvt_str2upper( &bsi->flt_where.bb_val.bv_val[ start ] );
+                       }
+               }
+       }
+
+       backsql_strfcat( &bsi->flt_where, "l", 
+                       (ber_len_t)sizeof( /* (' */ "')" ) - 1, /* ( */ "')" );
  
- return 1;
      return 1;
 }
 
-int backsql_process_filter(backsql_srch_info *bsi,Filter *f)
+static int
+backsql_process_filter( backsql_srch_info *bsi, Filter *f )
 {
- backsql_at_map_rec *at;
- backsql_at_map_rec oc_attr={"objectClass","","",NULL,NULL,NULL,NULL};
- char *at_name=NULL;
- int done=0,len=0;
-
- Debug(LDAP_DEBUG_TRACE,"==>backsql_process_filter()\n",0,0,0);
- switch(f->f_choice)
- {
-  case LDAP_FILTER_OR:
-                       backsql_process_filter_list(bsi,f->f_or,LDAP_FILTER_OR);
-                       done=1;
-                       break;
-  case LDAP_FILTER_AND:
-                       backsql_process_filter_list(bsi,f->f_and,LDAP_FILTER_AND);
-                       done=1;
-                       break;
-  case LDAP_FILTER_NOT:
-                       bsi->flt_where=backsql_strcat(bsi->flt_where,&bsi->fwhere_len,"NOT (",NULL);
-                       backsql_process_filter(bsi,f->f_not);
-                       bsi->flt_where=backsql_strcat(bsi->flt_where,&bsi->fwhere_len,")",NULL);
-                       done=1;
-                       break;
-  case LDAP_FILTER_PRESENT:
-                       at_name=f->f_type;
-                       break;
-  default:
-                       at_name=f->f_avtype;
-                       break;
- }
+       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(""), 
+               BER_BVNULL, NULL, NULL, NULL };
+       AttributeDescription    *ad = NULL;
+       int                     done = 0;
+       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 ) {
+               return 0;
+       }
+
+       switch( f->f_choice ) {
+       case LDAP_FILTER_OR:
+               rc = backsql_process_filter_list( bsi, f->f_or, 
+                               LDAP_FILTER_OR );
+               done = 1;
+               break;
+               
+       case LDAP_FILTER_AND:
+               rc = backsql_process_filter_list( bsi, f->f_and,
+                               LDAP_FILTER_AND );
+               done = 1;
+               break;
+
+       case LDAP_FILTER_NOT:
+               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, "c", /* ( */ ')' );
+               done = 1;
+               break;
+
+       case LDAP_FILTER_PRESENT:
+               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 ) {
+               goto impossible;
+       }
  
- if (done)
-  goto done;
-
- if (strcasecmp(at_name,"objectclass"))
-  at=backsql_at_with_name(bsi->oc,at_name);
- else
- {
-  at=&oc_attr;
-  at->sel_expr=backsql_strcat(at->sel_expr,&len,"'",bsi->oc->name,"'",NULL);
- }
- if (at==NULL)
- {
-  Debug(LDAP_DEBUG_TRACE,"backsql_process_filter(): attribute '%s' is not defined for objectclass '%s'\n",
-                      at_name,bsi->oc->name,0);
-  bsi->flt_where=backsql_strcat(bsi->flt_where,&bsi->fwhere_len," 1=0 ",NULL);
-  return -1;
- }
-                       
- backsql_merge_from_clause(&bsi->from,&bsi->from_len,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,at_name);
-
- if (at->join_where != NULL && strstr(bsi->join_where,at->join_where)==NULL)
-  bsi->join_where=backsql_strcat(bsi->join_where,&bsi->jwhere_len," AND ",at->join_where,NULL);
-
- //if (at!=&oc_attr)
- // bsi->sel=backsql_strcat(bsi->sel,&bsi->sel_len,",",at->sel_expr," AS ",at->name,NULL);
-
- switch(f->f_choice)
- {
-  case LDAP_FILTER_EQUALITY:
-                       //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)
-                        bsi->flt_where=backsql_strcat(bsi->flt_where,&bsi->fwhere_len,"(",
-                                       bsi->bi->upper_func,"(",at->sel_expr,")='",
-                                                                                       f->f_avvalue.bv_val,"')",NULL);
-                       else
-                        bsi->flt_where=backsql_strcat(bsi->flt_where,&bsi->fwhere_len,"(",at->sel_expr,"='",
-                                                                                       f->f_avvalue.bv_val,"')",NULL);
-                       break;
-  case LDAP_FILTER_GE:
-                       bsi->flt_where=backsql_strcat(bsi->flt_where,&bsi->fwhere_len,"(",at->sel_expr,">=",
-                                                                                                                       f->f_avvalue.bv_val,")",NULL);
-                       break;
-  case LDAP_FILTER_LE:
-                       bsi->flt_where=backsql_strcat(bsi->flt_where,&bsi->fwhere_len,"(",at->sel_expr,"<=",
-                                                                                                                       f->f_avvalue.bv_val,")",NULL);
-                       break;
-  case LDAP_FILTER_PRESENT:
-                       bsi->flt_where=backsql_strcat(bsi->flt_where,&bsi->fwhere_len,"NOT (",at->sel_expr,
-                                               " IS NULL)",NULL);
-                       break;
-  case LDAP_FILTER_SUBSTRINGS:
-                       backsql_process_sub_filter(bsi,f);
-                       break;
- }
+       if ( done ) {
+               goto done;
+       }
+
+       /*
+        * Turn structuralObjectClass into objectClass
+        */
+       if ( ad == slap_schema.si_ad_objectClass 
+                       || ad == slap_schema.si_ad_structuralObjectClass ) {
+               struct berbuf           bb = BB_NULL;
+
+               at = &oc_attr;
+               backsql_strfcat( &bb, "cbc",
+                               '\'', 
+                               &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, 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, &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.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 );
+       }
+
+       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 ( casefold && 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( "='" ) - 1,
+                                                       "='" );
+                       } else {
+                               backsql_strfcat( &bsi->flt_where, "cbcbl",
+                                               '(' /* ) */ ,
+                                               &bi->upper_func,
+                                               '(' /* ) */ ,
+                                               &at->sel_expr,
+                                               (ber_len_t)sizeof( /* ( */ ")='" ) - 1,
+                                                       /* ( */ ")='" );
+                       }
+
+                       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, "cblbl",
+                                       '(',
+                                       &at->sel_expr,
+                                       (ber_len_t)sizeof( "='" ) - 1, "='",
+                                       filter_value,
+                                       (ber_len_t)sizeof( /* (' */ "')" ) - 1,
+                                               /* (' */ "')" );
+               }
+               break;
+
+       case LDAP_FILTER_GE:
+               ordering.bv_val = ">=";
+
+               /* fall thru to next case */
+               
+       case LDAP_FILTER_LE:
+               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, "lbl",
+                               (ber_len_t)sizeof( "NOT (" ) - 1, "NOT (", 
+                               &at->sel_expr, 
+                               (ber_len_t)sizeof( " IS NULL)" ) - 1, " IS NULL)" );
+               break;
+
+       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:
- if (oc_attr.sel_expr!=NULL)
-  free(oc_attr.sel_expr);
- Debug(LDAP_DEBUG_TRACE,"<==backsql_process_filter()\n",0,0,0);
- return 1;
+       if ( oc_attr.sel_expr.bv_val != NULL ) {
+               free( oc_attr.sel_expr.bv_val );
+       }
+       
+       Debug( LDAP_DEBUG_TRACE, "<==backsql_process_filter()\n", 0, 0, 0 );
+       return 1;
+
+impossible:
+       if ( oc_attr.sel_expr.bv_val != NULL ) {
+               free( oc_attr.sel_expr.bv_val );
+       }
+       Debug( LDAP_DEBUG_TRACE, "<==backsql_process_filter() returns -1\n",
+                       0, 0, 0 );
+       return -1;
 }
 
-char* backsql_srch_query(backsql_srch_info *bsi)
+static int
+backsql_srch_query( backsql_srch_info *bsi, struct berval *query )
 {
- char *query=NULL;
- int q_len=0;
-
- Debug(LDAP_DEBUG_TRACE,"==>backsql_srch_query()\n",0,0,0);
- bsi->sel=NULL;
- bsi->from=NULL;
- bsi->join_where=NULL;
- bsi->flt_where=NULL;
- bsi->sel_len=bsi->from_len=bsi->jwhere_len=bsi->fwhere_len=0;
-
- bsi->sel=backsql_strcat(bsi->sel,&bsi->sel_len,
-                               "SELECT ldap_entries.id,",bsi->oc->keytbl,".",bsi->oc->keycol,
-                               ", '",bsi->oc->name,"' AS objectClass",
-                               ", ldap_entries.dn AS dn",
-                               NULL);
- bsi->from=backsql_strcat(bsi->from,&bsi->from_len," FROM ldap_entries,",bsi->oc->keytbl,NULL);
- bsi->join_where=backsql_strcat(bsi->join_where,&bsi->jwhere_len," WHERE ",
-        bsi->oc->keytbl,".",bsi->oc->keycol,"=ldap_entries.keyval AND ",
-        "ldap_entries.objclass=? AND ",NULL);
-
- switch(bsi->scope)
- {
-  case LDAP_SCOPE_BASE:
-        if (bsi->bi->upper_func)
-                {
-                 bsi->join_where=backsql_strcat(bsi->join_where,&bsi->jwhere_len,
-                        bsi->bi->upper_func,"(","ldap_entries.dn)=(?)",NULL);
-                }
-               else
-                {
-                 bsi->join_where=backsql_strcat(bsi->join_where,&bsi->jwhere_len,
-                               "ldap_entries.dn=?",NULL);
-                }
+       backsql_info    *bi = (backsql_info *)bsi->op->o_bd->be_private;
+       int             rc;
+
+       assert( query );
+       query->bv_val = NULL;
+       query->bv_len = 0;
+
+       Debug( LDAP_DEBUG_TRACE, "==>backsql_srch_query()\n", 0, 0, 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;
+
+       backsql_strfcat( &bsi->sel, "lbcbc",
+                       (ber_len_t)sizeof( "SELECT DISTINCT ldap_entries.id," ) - 1,
+                               "SELECT DISTINCT ldap_entries.id,", 
+                       &bsi->oc->keytbl, 
+                       '.', 
+                       &bsi->oc->keycol, 
+                       ',' );
+
+       if ( bi->strcast_func.bv_val ) {
+               backsql_strfcat( &bsi->sel, "blbl",
+                               &bi->strcast_func, 
+                               (ber_len_t)sizeof( "('" /* ') */ ) - 1,
+                                       "('" /* ') */ ,
+                               &bsi->oc->oc->soc_cname,
+                               (ber_len_t)sizeof( /* (' */ "')" ) - 1,
+                                       /* (' */ "')" );
+       } else {
+               backsql_strfcat( &bsi->sel, "cbc",
+                               '\'',
+                               &bsi->oc->oc->soc_cname,
+                               '\'' );
+       }
+       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, "lb",
+                       (ber_len_t)sizeof( " FROM ldap_entries," ) - 1,
+                               " FROM ldap_entries,",
+                       &bsi->oc->keytbl );
+
+       backsql_strfcat( &bsi->join_where, "lbcbl",
+                       (ber_len_t)sizeof( " WHERE " ) - 1, " WHERE ",
+                       &bsi->oc->keytbl,
+                       '.',
+                       &bsi->oc->keycol,
+                       (ber_len_t)sizeof( "=ldap_entries.keyval AND ldap_entries.oc_map_id=? AND " ) - 1,
+                               "=ldap_entries.keyval AND ldap_entries.oc_map_id=? AND " );
+
+       switch ( bsi->scope ) {
+       case LDAP_SCOPE_BASE:
+               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)=",
+                                       &bi->upper_func_open,
+                                       '?', 
+                                       &bi->upper_func_close );
+               } else {
+                       backsql_strfcat( &bsi->join_where, "l",
+                                       (ber_len_t)sizeof( "ldap_entries.dn=?" ) - 1,
+                                               "ldap_entries.dn=?" );
+               }
                break;
-  case LDAP_SCOPE_ONELEVEL:
-               bsi->join_where=backsql_strcat(bsi->join_where,&bsi->jwhere_len,
-                               "ldap_entries.parent=?",NULL);
+               
+       case LDAP_SCOPE_ONELEVEL:
+               backsql_strfcat( &bsi->join_where, "l",
+                               (ber_len_t)sizeof( "ldap_entries.parent=?" ) - 1,
+                                       "ldap_entries.parent=?" );
                break;
-  case LDAP_SCOPE_SUBTREE:
-               bsi->join_where=backsql_strcat(bsi->join_where,&bsi->jwhere_len,
-                               bsi->bi->subtree_cond,NULL);
+
+       case LDAP_SCOPE_SUBTREE:
+               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;
- }
- if (backsql_process_filter(bsi,bsi->filter))
-  query=backsql_strcat(query,&q_len,bsi->sel,bsi->from,bsi->join_where," AND ",bsi->flt_where,NULL);
 
+       default:
+               assert( 0 );
+       }
+
+       rc = backsql_process_filter( bsi, bsi->filter );
+       if ( rc > 0 ) {
+               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.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
+                */
+               free( query->bv_val );
+               query->bv_val = NULL;
+       }
  
- free(bsi->sel);
- free(bsi->from);
- free(bsi->join_where);
- free(bsi->flt_where);
- bsi->sel_len=bsi->from_len=bsi->jwhere_len=bsi->fwhere_len=0;
- Debug(LDAP_DEBUG_TRACE,"<==backsql_srch_query()\n",0,0,0);
- return query;
+       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() returns %s\n",
+               query->bv_val ? query->bv_val : "NULL", 0, 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 )
 {
- char *query=NULL;
- SQLHSTMT sth;
- RETCODE rc;
- backsql_entryID base_id,*res,*c_id;
- //Entry *e;
- BACKSQL_ROW_NTS row;
- //int i;
+       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_entryID         base_id, *c_id;
+       int                     res;
+       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,0,0);
- bsi->oc=oc;
- query=backsql_srch_query(bsi);
- if (query==NULL)
- {
-  Debug(LDAP_DEBUG_TRACE,"backsql_oc_get_candidates(): could not construct query for objectclass\n",0,0,0);
-  return 1;
- }
-
- Debug(LDAP_DEBUG_TRACE,"Constructed query: %s\n",query,0,0);
- if ((rc=backsql_Prepare(bsi->dbh,&sth,query,0)) != 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);
-   free(query);
-   return 1;
-  }
- free(query);
-
- 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;
- }
- switch(bsi->scope)
- {
-  case LDAP_SCOPE_BASE:
-  case LDAP_SCOPE_SUBTREE:
-               if ((rc=backsql_BindParamStr(sth,2,bsi->base_dn,BACKSQL_MAX_DN_LEN)) != 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,sth,rc);
-         return 1;
+       Debug(  LDAP_DEBUG_TRACE, "==>backsql_oc_get_candidates(): oc='%s'\n",
+                       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 );
+               /* should never get here */
+               assert( 0 );
+               bsi->status = LDAP_ADMINLIMIT_EXCEEDED;
+               return BACKSQL_STOP;
+       }
+       
+       bsi->oc = oc;
+       res = backsql_srch_query( bsi, &query );
+       if ( res ) {
+               Debug( LDAP_DEBUG_TRACE, "backsql_oc_get_candidates(): "
+                       "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", 
+                       query.bv_val, 0, 0 );
+
+       rc = backsql_Prepare( bsi->dbh, &sth, query.bv_val, 0 );
+       free( query.bv_val );
+       if ( rc != SQL_SUCCESS ) {
+               Debug( LDAP_DEBUG_TRACE, "backsql_oc_get_candidates(): "
+                       "error preparing query\n", 0, 0, 0 );
+               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 );
+               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( bi->db_env, bsi->dbh, 
+                                       sth, rc );
+                       bsi->status = LDAP_OTHER;
+                       return BACKSQL_CONTINUE;
                }
                break;
-  case LDAP_SCOPE_ONELEVEL:
-               res=backsql_dn2id(bsi->bi,&base_id,bsi->dbh,bsi->base_dn);
-               if (res==NULL)
-               {
-                Debug(LDAP_DEBUG_TRACE,"backsql_oc_get_candidates(): could not retrieve base_dn id - no such entry\n",0,0,0);
-                bsi->status=LDAP_NO_SUCH_OBJECT;
-                return 0;
-               }
-               if (backsql_BindParamID(sth,2,&base_id.id) != SQL_SUCCESS)
-               {
-                Debug(LDAP_DEBUG_TRACE,"backsql_oc_get_candidates(): error binding base id parameter\n",0,0,0);
-                free(base_id.dn);
-                return 1;
-               }               
-               free(base_id.dn);
+
+       case LDAP_SCOPE_SUBTREE: {
+
+               /* 
+                * + 1 because we need room for '%'; this makes a subtree
+                * search for a DN BACKSQL_MAX_DN_LEN long legal 
+                * if it returns that DN only
+                */
+               char            temp_base_dn[ BACKSQL_MAX_DN_LEN + 1 + 1 ];
+
+               /*
+                * We do not accept DNs longer than BACKSQL_MAX_DN_LEN;
+                * however this should be handled earlier
+                */
+               assert( bsi->base_dn->bv_len <= BACKSQL_MAX_DN_LEN );
+                       
+               /* 
+                * Sets the parameters for the SQL built earlier
+                * NOTE that all the databases could actually use 
+                * the TimesTen version, which would be cleaner 
+                * and would also eliminate the need for the
+                * subtree_cond line in the configuration file.  
+                * For now, I'm leaving it the way it is, 
+                * so non-TimesTen databases use the original code.
+                * But at some point this should get cleaned up.
+                *
+                * 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( bi ) ) {
+                       temp_base_dn[ 0 ] = '\0';
+                       for ( i = 0, j = bsi->base_dn->bv_len - 1;
+                                       j >= 0; i++, j--) {
+                               temp_base_dn[ i ] = bsi->base_dn->bv_val[ j ];
+                       }
+                       temp_base_dn[ i ] = '%';
+                       temp_base_dn[ i + 1 ] = '\0';
+
+               } 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 );
+
+               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 );
+               if ( rc != SQL_SUCCESS ) {
+                       Debug( LDAP_DEBUG_TRACE, "backsql_oc_get_candidates(): "
+                               "error binding base_dn parameter (2)\n",
+                               0, 0, 0 );
+                       backsql_PrintErrors( bi->db_env, bsi->dbh, 
+                                       sth, rc );
+                       bsi->status = LDAP_OTHER;
+                       return BACKSQL_CONTINUE;
+               }
                break;
- }
- if ((rc=SQLExecute(sth)) != SQL_SUCCESS && rc!= SQL_SUCCESS_WITH_INFO)
-  {
-   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);
-   SQLFreeStmt(sth,SQL_DROP);
-   return 1;
-  }
-
- backsql_BindRowAsStrings(sth,&row);
- while ((rc=SQLFetch(sth)) == SQL_SUCCESS || rc==SQL_SUCCESS_WITH_INFO)
-  {
-   /*
-   e=(Entry*)ch_calloc(1,sizeof(Entry)); 
-   for (i=1;i<row.ncols;i++)
-    {
-     if (row.is_null[i]>0)
-      {
-       backsql_entry_addattr(e,row.col_names[i],row.cols[i],row.col_prec[i]);
-//       Debug(LDAP_DEBUG_TRACE,"prec=%d\n",(int)row.col_prec[i],0,0);
-      }
-    // else
-    //  Debug(LDAP_DEBUG_TRACE,"NULL value in this row for attribute '%s'\n",row.col_names[i],0,0);
-    }
-   */
-
-   c_id=(backsql_entryID*)ch_calloc(1,sizeof(backsql_entryID));
-   c_id->id=atoi(row.cols[0]);
-   c_id->keyval=atoi(row.cols[1]);
-   c_id->oc_id=bsi->oc->id;
-   c_id->dn=ch_strdup(row.cols[3]);
-   c_id->next=bsi->id_list;
-   bsi->id_list=c_id;
-   Debug(LDAP_DEBUG_TRACE,"backsql_oc_get_candidates(): added entry id=%d, keyval=%d dn='%s'\n",
-               c_id->id,c_id->keyval,row.cols[3]);
-  }
- backsql_FreeRow(&row);
- SQLFreeStmt(sth,SQL_DROP);
- Debug(LDAP_DEBUG_TRACE,"<==backsql_oc_get_candidates()\n",0,0,0);
- return 1;
+       }
+
+       case LDAP_SCOPE_ONELEVEL:
+               res = backsql_dn2id( bi, &base_id, 
+                               bsi->dbh, bsi->base_dn );
+               if ( res != LDAP_SUCCESS ) {
+                       Debug( LDAP_DEBUG_TRACE, "backsql_oc_get_candidates(): "
+                               "could not retrieve base_dn id%s\n",
+                               res == LDAP_NO_SUCH_OBJECT ? ": no such entry"
+                               : "", 0, 0 );
+                       bsi->status = res;
+                       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 );
+                       bsi->status = LDAP_OTHER;
+                       return BACKSQL_CONTINUE;
+               }
+               break;
+       }
+       
+       rc = SQLExecute( sth );
+       if ( !BACKSQL_SUCCESS( rc ) ) {
+               Debug( LDAP_DEBUG_TRACE, "backsql_oc_get_candidates(): "
+                       "error executing query\n", 0, 0, 0 );
+               backsql_PrintErrors( bi->db_env, bsi->dbh, sth, rc );
+               SQLFreeStmt( sth, SQL_DROP );
+               bsi->status = LDAP_OTHER;
+               return BACKSQL_CONTINUE;
+       }
+
+       backsql_BindRowAsStrings( sth, &row );
+       rc = SQLFetch( sth );
+       for ( ; BACKSQL_SUCCESS( rc ); rc = SQLFetch( sth ) ) {
+               c_id = (backsql_entryID *)ch_calloc( 1, 
+                               sizeof( backsql_entryID ) );
+               c_id->id = strtol( row.cols[ 0 ], NULL, 0 );
+               c_id->keyval = strtol( row.cols[ 1 ], NULL, 0 );
+               c_id->oc_id = bsi->oc->id;
+               ber_str2bv( row.cols[ 3 ], 0, 1, &c_id->dn );
+               c_id->next = bsi->id_list;
+               bsi->id_list = c_id;
+               bsi->n_candidates--;
+
+               Debug( LDAP_DEBUG_TRACE, "backsql_oc_get_candidates(): "
+                       "added entry id=%ld, keyval=%ld dn='%s'\n",
+                       c_id->id, c_id->keyval, row.cols[ 3 ] );
+
+               if ( bsi->n_candidates == -1 ) {
+                       break;
+               }
+       }
+       backsql_FreeRow( &row );
+       SQLFreeStmt( sth, SQL_DROP );
+
+       Debug( LDAP_DEBUG_TRACE, "<==backsql_oc_get_candidates(): %d\n",
+                       n_candidates - bsi->n_candidates, 0, 0 );
+
+       return ( bsi->n_candidates == -1 ? BACKSQL_STOP : BACKSQL_CONTINUE );
 }
 
-int backsql_search(BackendDB *be,Connection *conn,Operation *op,
-       const char *base, const char *nbase, int scope,int deref,int slimit,int tlimit,
-       Filter *filter, const char *filterstr,char **attrs,int attrsonly)
+int
+backsql_search( Operation *op, SlapReply *rs )
 {
- backsql_info *bi=(backsql_info*)be->be_private;
- SQLHDBC dbh;
- int sres;
- int nentries;
- Entry entry,*res;
- int manageDSAit = get_manageDSAit( op );
- struct berval **v2refs = NULL;
- time_t        stoptime;
- backsql_srch_info srch_info;
- backsql_entryID *eid=NULL;
-
- Debug(LDAP_DEBUG_TRACE,"==>backsql_search(): base='%s', filter='%s', scope=%d,",
-                     nbase,filterstr,scope);
- Debug(LDAP_DEBUG_TRACE," deref=%d, attrsonly=%d, attributes to load: %s\n",
-        deref,attrsonly,attrs==NULL?"all":"custom list");
- dbh=backsql_get_db_conn(be,conn);
-
- if (!dbh)
- {
-  Debug(LDAP_DEBUG_TRACE,"backsql_search(): could not get connection handle - exiting\n",0,0,0);
-  send_ldap_result(conn,op,LDAP_OTHER,"","SQL-backend error",NULL,NULL);
-  return 1;
- }
- if (tlimit == 0 && be_isroot(be,op->o_dn))
-  {
-   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;
-  }
-  
- if (slimit == 0 && be_isroot(be,op->o_dn))
-  {
-   slimit = -1;        /* allow root to set no limit */
-  }
- else
-  {
-   slimit = (slimit > be->be_sizelimit || slimit < 1) ?
-                   be->be_sizelimit : slimit;
-  }
-
- backsql_init_search(&srch_info,bi,(char*)nbase,scope,slimit,tlimit,stoptime,filter,dbh,
-                be,conn,op,attrs);
-
- //for each objectclass we try to construct query which gets IDs
- //of entries matching LDAP query filter and scope (or at least candidates),
- //and get the IDs
- avl_apply(bi->oc_by_name,(AVL_APPLY)backsql_oc_get_candidates,&srch_info,0,AVL_INORDER);
-            
- nentries=0;
- //now we load candidate entries (only those attrubutes mentioned in attrs and filter),
- //test it against full filter and then send to client
- for(eid=srch_info.id_list;eid!=NULL;eid=eid->next)
-  {
-   /* check for abandon */
-   ldap_pvt_thread_mutex_lock(&op->o_abandonmutex);
-   if (op->o_abandon)
-    {
-     ldap_pvt_thread_mutex_unlock(&op->o_abandonmutex);
-     break;
-    }
-   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 );
-     
-     break;
-    }
-     
-   Debug(LDAP_DEBUG_TRACE,"backsql_search(): loading data for entry id=%d, oc_id=%d, keyval=%d\n",
-               eid->id,eid->oc_id,eid->keyval);
-   
-   res=backsql_id2entry(&srch_info,&entry,eid);
-   if (res==NULL)
-    {
-     Debug(LDAP_DEBUG_TRACE,"backsql_search(): error in backsql_id2entry() - skipping entry\n",0,0,0);
-     continue;
-    }
-
-   if ( !manageDSAit && scope != LDAP_SCOPE_BASE &&
-                       is_entry_referral( &entry ) )
-    {
-     struct berval **refs = get_entry_referrals(be,conn,op,&entry);
-
-     send_search_reference( be, conn, op, &entry, refs, scope, NULL, &v2refs );
-     ber_bvecfree( refs );
-     continue;
-    }
-
-  // if (test_filter(be,conn,op,&entry,filter)==0)
-    {
-     if ((sres=send_search_entry(be,conn,op,&entry,attrs,attrsonly,NULL))==-1)
-      {
-       Debug(LDAP_DEBUG_TRACE,"backsql_search(): connection lost\n",0,0,0);
-       break;
-      }
-     nentries+=!sres;                                  
-    }
-  }
-
- for(eid=srch_info.id_list;eid!=NULL;eid=backsql_free_entryID(eid));
-
- charray_free(srch_info.attrs);
-
- if (nentries>0)
-  send_search_result( conn, op,
-               v2refs == NULL ? LDAP_SUCCESS : LDAP_REFERRAL,
-               NULL, NULL, v2refs, NULL, nentries );
- else
-  send_ldap_result(conn,op,LDAP_NO_SUCH_OBJECT,NULL,NULL,NULL,0);
- Debug(LDAP_DEBUG_TRACE,"<==backsql_search()\n",0,0,0);
- return 0;
+       backsql_info            *bi = (backsql_info *)op->o_bd->be_private;
+       SQLHDBC                 dbh;
+       int                     sres;
+       Entry                   *entry, *res;
+       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,", 
+               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",
+               op->oq_search.rs_deref,
+               op->oq_search.rs_attrsonly,
+               op->oq_search.rs_attrs == NULL ? "all" : "custom list" );
+
+       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", 
+                       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
+                */
+               rs->sr_err = LDAP_ADMINLIMIT_EXCEEDED;
+               send_ldap_result( op, rs );
+               return 1;
+       }
+
+       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 );
+               rs->sr_err = sres;
+               rs->sr_text = sres == LDAP_OTHER ?  "SQL-backend error" : NULL;
+               send_ldap_result( op, rs );
+               return 1;
+       }
+
+       /* if not root, get appropriate limits */
+       if ( be_isroot( op->o_bd, &op->o_ndn ) ) {
+               isroot = 1;
+       } else {
+               ( void ) get_limits( op->o_bd, &op->o_ndn, &limit );
+       }
+
+       /* The time/size limits come first because they require very little
+        * effort, so there's no chance the candidates are selected and then 
+        * the request is not honored only because of time/size constraints */
+
+       /* if no time limit requested, use soft limit (unless root!) */
+       if ( isroot ) {
+               if ( op->oq_search.rs_tlimit == 0 ) {
+                       op->oq_search.rs_tlimit = -1;   /* allow root to set no limit */
+               }
+
+               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 ) {
+                               rs->sr_err = LDAP_ADMINLIMIT_EXCEEDED;
+                               send_ldap_result( op, rs );
+                               return 0;
+                       }
+               
+                       /* 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 ) {
+                               rs->sr_err = LDAP_ADMINLIMIT_EXCEEDED;
+                               send_ldap_result( op, rs );
+                               return 0;
+                       }
+                       
+                       /* negative hard limit means no limit */
+               }
+       }
+
+       /* compute it anyway; root does not use it */
+       stoptime = op->o_time + op->oq_search.rs_tlimit;
+
+       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
+        * of entries matching LDAP query filter and scope (or at least 
+        * candidates), and get the IDs
+        */
+       srch_info.n_candidates = ( isroot ? -2 : limit->lms_s_unchecked == -1 
+                       ? -2 : limit->lms_s_unchecked );
+       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 ) {
+                       rs->sr_err = LDAP_ADMINLIMIT_EXCEEDED;
+                       send_ldap_result( op, rs );
+                       goto done;
+               }
+       }
+       
+       /*
+        * now we load candidate entries (only those attributes 
+        * mentioned in attrs and filter), test it against full filter 
+        * and then send to client
+        */
+       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 ) {
+                       break;
+               }
+
+               /* check time limit */
+               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;
+               }
+
+               Debug(LDAP_DEBUG_TRACE, "backsql_search(): loading data "
+                       "for entry id=%ld, oc_id=%ld, keyval=%ld\n",
+                       eid->id, eid->oc_id, eid->keyval );
+
+               entry = (Entry *)ch_calloc( sizeof( Entry ), 1 );
+               res = backsql_id2entry( &srch_info, entry, eid );
+               if ( res == NULL ) {
+                       Debug( LDAP_DEBUG_TRACE, "backsql_search(): "
+                               "error in backsql_id2entry() "
+                               "- skipping entry\n", 0, 0, 0 );
+                       continue;
+               }
+
+               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;
+
+                       continue;
+               }
+
+               /*
+                * 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 ) {
+                       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:
+                               break;
+
+                       case -1:
+                               Debug( LDAP_DEBUG_TRACE, "backsql_search(): "
+                                       "connection lost\n", 0, 0, 0 );
+                               goto end_of_search;
+
+                       default:
+                               /*
+                                * FIXME: send_search_entry failed;
+                                * better stop
+                                */
+                               break;
+                       }
+               }
+               entry_free( entry );
+
+               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 ( rs->sr_nentries > 0 ) {
+               rs->sr_ref = rs->sr_v2ref;
+               rs->sr_err = (rs->sr_v2ref == NULL) ? LDAP_SUCCESS
+                       : LDAP_REFERRAL;
+       } else {
+               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 );
+
+       Debug( LDAP_DEBUG_TRACE, "<==backsql_search()\n", 0, 0, 0 );
+       return 0;
 }
 
 #endif /* SLAPD_SQL */
+