Revert 1.452.2.27 to sync with rest of tree

diff --git a/servers/slapd/slap.h b/servers/slapd/slap.h
index 8cc4dc9fee0b78c785c77ff8efcd94c2b697e679..abf258e541d3f8d8d77352f5af92927c2ac4bd8b 100644 (file)
--- a/servers/slapd/slap.h
+++ b/servers/slapd/slap.h
@@ -1632,10 +1632,6 @@ typedef struct req_add_s {
        Entry *rs_e;
 } req_add_s;
 
-typedef struct req_delete_s {
-       struct berval rd_csn;
-} req_delete_s;
-
 typedef struct req_abandon_s {
        ber_int_t rs_msgid;
 } req_abandon_s;
@@ -1998,7 +1994,6 @@ typedef struct slap_op {
                req_add_s oq_add;
                req_bind_s oq_bind;
                req_compare_s oq_compare;
-               req_delete_s oq_delete;
                req_modify_s oq_modify;
                req_modrdn_s oq_modrdn;
                req_search_s oq_search;
@@ -2012,7 +2007,6 @@ typedef struct slap_op {
 #define oq_add o_request.oq_add
 #define oq_bind o_request.oq_bind
 #define oq_compare o_request.oq_compare
-#define oq_delete o_request.oq_delete
 #define oq_modify o_request.oq_modify
 #define oq_modrdn o_request.oq_modrdn
 #define oq_search o_request.oq_search
@@ -2027,8 +2021,6 @@ typedef struct slap_op {
 #define orb_edn oq_bind.rb_edn
 #define orb_ssf oq_bind.rb_ssf
 
-#define ord_csn oq_delete.rd_csn
-
 #define ors_scope oq_search.rs_scope
 #define ors_deref oq_search.rs_deref
 #define ors_slimit oq_search.rs_slimit