remove dnNormalize2

[openldap] / servers / slapd / back-sql / util.h

diff --git a/servers/slapd/back-sql/util.h b/servers/slapd/back-sql/util.h
index a9f1042d03d0e34836d97358f4da73587041d284..a510a604aa05fff0a32f8447af436dbbcaefa569 100644 (file)
--- a/servers/slapd/back-sql/util.h
+++ b/servers/slapd/back-sql/util.h
@@ -16,45 +16,48 @@
 
 #define BACKSQL_CONCAT
 
-struct berval * backsql_strcat( struct berval *dest, ber_len_t *buflen, ... );
-struct berval * backsql_strfcat( struct berval *dest, ber_len_t *buflen,
-               const char *fmt, ... );
+typedef struct berbuf {
+       struct berval   bb_val;
+       ber_len_t       bb_len;
+} BerBuffer;
+#define BB_NULL                { { 0, NULL }, 0 }
+
+struct berbuf * backsql_strcat( struct berbuf *dest, ... );
+struct berbuf * backsql_strfcat( struct berbuf *dest, const char *fmt, ... );
 
 int backsql_entry_addattr( Entry *e, struct berval *at_name, 
-               struct berval *at_val );
+               struct berval *at_val, void *memctx );
 
 typedef struct backsql_srch_info {
+       Operation               *op;
+
+       int                     bsi_flags;
+#define        BSQL_SF_ALL_OPER                0x0001
+#define BSQL_SF_FILTER_HASSUBORDINATE  0x0002
+
        struct berval           *base_dn;
        int                     scope;
        Filter                  *filter;
        int                     slimit, tlimit;
        time_t                  stoptime;
+
        backsql_entryID         *id_list, *c_eid;
        int                     n_candidates;
        int                     abandon;
-       backsql_info            *bi;
+       int                     status;
+
        backsql_oc_map_rec      *oc;
-       struct berval           sel, from, join_where, flt_where;
-       ber_len_t               sel_len, from_len, jwhere_len, fwhere_len;
+       struct berbuf           sel, from, join_where, flt_where;
        SQLHDBC                 dbh;
-       int                     status;
-       Backend                 *be;
-       Connection              *conn;
-       Operation               *op;
        AttributeName           *attrs;
-       int                     attr_flags;
-#define        BSQL_SF_ALL_OPER        0x0001
+
        Entry                   *e;
-       /* 1 if the db is TimesTen; 0 if it's not */
-       int                     use_reverse_dn; 
 } backsql_srch_info;
 
-int backsql_process_filter( backsql_srch_info *bsi, Filter *f );
-void backsql_init_search( backsql_srch_info *bsi, backsql_info *bi,
+void backsql_init_search( backsql_srch_info *bsi, 
                struct berval *nbase, int scope, int slimit, int tlimit,
                time_t stoptime, Filter *filter, SQLHDBC dbh,
-               BackendDB *be, Connection *conn, Operation *op,
-               AttributeName *attrs );
+               Operation *op, AttributeName *attrs );
 Entry *backsql_id2entry( backsql_srch_info *bsi, Entry *e, 
                backsql_entryID *id );
 
@@ -71,7 +74,7 @@ extern char
 extern char 
        backsql_check_dn_ru_query[];
 
-int backsql_merge_from_clause( struct berval *dest_from, ber_len_t *dest_len, 
+int backsql_merge_from_clause( struct berbuf *dest_from, 
                struct berval *src_from );
 
 int backsql_split_pattern( const char *pattern, BerVarray *split_pattern,