ITS#3576 use actual backend (not glue instance) for restriction and

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

diff --git a/servers/slapd/back-sql/proto-sql.h b/servers/slapd/back-sql/proto-sql.h
index 75b2634941bd40cdd1c533ef264a5ebf8a19402c..8019284223d1e0e0712fcc321fbfe705c86273c4 100644 (file)
--- a/servers/slapd/back-sql/proto-sql.h
+++ b/servers/slapd/back-sql/proto-sql.h
@@ -124,7 +124,8 @@ int backsql_count_children( backsql_info *bi, SQLHDBC dbh,
 int backsql_has_children( backsql_info *bi, SQLHDBC dbh, struct berval *dn );
 
 /* frees *id and returns next in list */
-backsql_entryID *backsql_free_entryID( backsql_entryID *id, int freeit );
+backsql_entryID *backsql_free_entryID( Operation *op, backsql_entryID *id,
+               int freeit );
 
 /* turns an ID into an entry */
 int backsql_id2entry( backsql_srch_info *bsi, backsql_entryID *id );
@@ -162,13 +163,6 @@ int backsql_destroy_schema_map( backsql_info *si );
  * search.c
  */
 
-/* the function must collect the entry associated to nbase */
-#define BACKSQL_ISF_GET_ID     0x1U
-#define BACKSQL_ISF_MATCHED    0x2U
-#define BACKSQL_IS_GET_ID(f) \
-       ( ( (f) & BACKSQL_ISF_GET_ID ) == BACKSQL_ISF_GET_ID )
-#define BACKSQL_IS_MATCHED(f) \
-       ( ( (f) & BACKSQL_ISF_MATCHED ) == BACKSQL_ISF_MATCHED )
 int backsql_init_search( backsql_srch_info *bsi, 
                struct berval *nbase, int scope, int slimit, int tlimit,
                time_t stoptime, Filter *filter, SQLHDBC dbh,
@@ -230,9 +224,9 @@ extern char
        backsql_def_needs_select_oc_query[],
        backsql_def_at_query[],
        backsql_def_delentry_stmt[],
+       backsql_def_renentry_stmt[],
        backsql_def_insentry_stmt[],
        backsql_def_delobjclasses_stmt[],
-       backsql_def_delreferrals_stmt[],
        backsql_def_subtree_cond[],
        backsql_def_upper_subtree_cond[],
        backsql_id_query[],
@@ -243,7 +237,7 @@ extern char
 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, 
+int backsql_entry_addattr( Entry *e, AttributeDescription *ad, 
                struct berval *at_val, void *memctx );
 
 int backsql_merge_from_clause( struct berbuf *dest_from,