ITS#3309 better fix, add op->ord_csn in frontend and use it in backend.

servers/slapd/back-bdb/delete.c

@@ -19,8 +19,6 @@
 #include <stdio.h>
 #include <ac/string.h>
 
-#include "lutil.h"
-
 #include "back-bdb.h"
 #include "external.h"
 
@@ -49,8 +47,6 @@ bdb_delete( Operation *op, SlapReply *rs )
 	EntryInfo   *suffix_ei;
 	Entry       *ctxcsn_e;
 	int         ctxcsn_added = 0;
-	char		csnbuf[ LDAP_LUTIL_CSNSTR_BUFSIZE ];
-	struct berval	csn;
 
 	LDAPControl **preread_ctrl = NULL;
 	LDAPControl *ctrls[SLAP_MAX_RESPONSE_CONTROLS];
@@ -69,8 +65,6 @@ bdb_delete( Operation *op, SlapReply *rs )
 		op->o_req_dn.bv_val, 0, 0 );
 #endif
 
-	slap_get_csn( op, csnbuf, sizeof(csnbuf), &csn, 1 );
-
 	if( 0 ) {
 retry:	/* transaction retry */
 		if( e != NULL ) {
@@ -591,9 +585,9 @@ retry:	/* transaction retry */
 				if( (void *) e->e_attrs != (void *) (e+1)) {
 					attr_delete( &e->e_attrs, slap_schema.si_ad_entryCSN );
 					attr_merge_normalize_one( e, slap_schema.si_ad_entryCSN,
-					&csn, NULL );
+					&op->ord_csn, NULL );
 				} else {
-					a->a_vals[0] = csn;
+					a->a_vals[0] = op->ord_csn;
 				}
 			} else {
 				/* Hm, the entryCSN ought to exist. ??? */

servers/slapd/delete.c

@@ -228,12 +228,11 @@ fe_op_delete( Operation *op, SlapReply *rs )
 			struct berval	org_dn = BER_BVNULL;
 			struct berval	org_ndn = BER_BVNULL;
 			int		org_managedsait;
+			char csnbuf[ LDAP_LUTIL_CSNSTR_BUFSIZE ];
 			slap_callback 	cb = { NULL, slap_replog_cb, NULL, NULL };
 
 			if ( !repl_user ) {
-				struct berval csn = { 0 , NULL };
-				char csnbuf[ LDAP_LUTIL_CSNSTR_BUFSIZE ];
-				slap_get_csn( op, csnbuf, sizeof(csnbuf), &csn, 1 );
+				slap_get_csn( op, csnbuf, sizeof(csnbuf), &op->ord_csn, 1 );
 			}
 
 #ifdef SLAPD_MULTIMASTER

servers/slapd/slap.h

@@ -1685,6 +1685,10 @@ typedef struct req_add_s {
 	Modifications *rs_modlist;	/* FIXME: temporary */
 } 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;
@@ -2062,6 +2066,7 @@ 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;
@@ -2075,6 +2080,7 @@ 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
@@ -2109,6 +2115,7 @@ typedef struct slap_op {
 #define orc_ava oq_compare.rs_ava
 #define ora_e oq_add.rs_e
 #define ora_modlist oq_add.rs_modlist
+#define ord_csn oq_delete.rd_csn
 #define orn_msgid oq_abandon.rs_msgid
 #define orm_modlist oq_modify.rs_modlist
 #define orm_increment oq_modify.rs_increment