syncrepl consistency patch

[openldap] / servers / slapd / slap.h

diff --git a/servers/slapd/slap.h b/servers/slapd/slap.h
index 6b762c6bbcc7b3697a40a59a7ce3ead68a00dad9..5d7b4f91e8806d1e4baf0cf66bc980c324fe590c 100644 (file)
--- a/servers/slapd/slap.h
+++ b/servers/slapd/slap.h
@@ -1662,6 +1662,7 @@ typedef struct req_search_s {
        AttributeName *rs_attrs;
        Filter *rs_filter;
        struct berval rs_filterstr;
+       int rs_post_search_id;
 } req_search_s;
 
 typedef struct req_compare_s {
@@ -1998,6 +1999,7 @@ typedef struct slap_paged_state {
 #define LDAP_PSEARCH_BY_PREMODIFY      0x03
 #define LDAP_PSEARCH_BY_MODIFY         0x04
 #define LDAP_PSEARCH_BY_SCOPEOUT       0x05
+#define LDAP_PSEARCH_BY_PREDELETE      0x06
 
 struct psid_entry {
        struct slap_op *ps_op;
@@ -2029,6 +2031,16 @@ struct slap_csn_entry {
        LDAP_TAILQ_ENTRY (slap_csn_entry) ce_csn_link;
 };
 
+struct pc_entry {
+       ID pc_id;
+       int pc_sent;
+       struct berval pc_csn;
+       struct berval pc_entryUUID;
+       struct berval pc_ename;
+       struct berval pc_enname;
+       LDAP_TAILQ_ENTRY( pc_entry ) pc_link;
+};
+
 /*
  * Caches the result of a backend_group check for ACL evaluation
  */
@@ -2101,6 +2113,7 @@ typedef struct slap_op {
 #define ors_attrs oq_search.rs_attrs
 #define ors_filter oq_search.rs_filter
 #define ors_filterstr oq_search.rs_filterstr
+#define ors_post_search_id oq_search.rs_post_search_id
 
 #define orr_newrdn oq_modrdn.rs_newrdn
 #define orr_nnewrdn oq_modrdn.rs_nnewrdn
@@ -2202,6 +2215,12 @@ typedef struct slap_op {
        LDAP_LIST_ENTRY(slap_op) o_ps_link;
        LDAP_LIST_HEAD(pe, psid_entry) o_pm_list;
 
+       int o_refresh_in_progress;
+       LDAP_TAILQ_HEAD(pc_pre, pc_entry) o_ps_pre_candidates;
+       LDAP_TAILQ_HEAD(pc_post, pc_entry) o_ps_post_candidates;
+       Avlnode *o_psearch_finished;
+       ldap_pvt_thread_mutex_t o_pcmutex;
+
        AuthorizationInformation o_authz;
 
        BerElement      *o_ber;         /* ber of the request */