From: Howard Chu <hyc@openldap.org>
Date: Thu, 2 Sep 2004 11:08:20 +0000 (+0000)
Subject: ITS#3309 import better fix from HEAD
X-Git-Tag: OPENLDAP_REL_ENG_2_2_16~8
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=31f7dbca3d6e17950dd97de2a2a5273e95bbee5e;p=openldap

ITS#3309 import better fix from HEAD
---

diff --git a/servers/slapd/back-bdb/delete.c b/servers/slapd/back-bdb/delete.c
index c62a51cb53..7843d632c7 100644
--- a/servers/slapd/back-bdb/delete.c
+++ b/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. ??? */
diff --git a/servers/slapd/delete.c b/servers/slapd/delete.c
index 70f4cee5e0..7db8a412e6 100644
--- a/servers/slapd/delete.c
+++ b/servers/slapd/delete.c
@@ -211,11 +211,10 @@ do_delete(
 #endif
 		{
 			slap_callback cb = { NULL, slap_replog_cb, NULL, NULL };
+			char csnbuf[ LDAP_LUTIL_CSNSTR_BUFSIZE ];
 
 			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
diff --git a/servers/slapd/slap.h b/servers/slapd/slap.h
index 63daf94381..8ecdc581c7 100644
--- a/servers/slapd/slap.h
+++ b/servers/slapd/slap.h
@@ -1633,6 +1633,10 @@ 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;
@@ -1995,6 +1999,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;
@@ -2008,6 +2013,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
@@ -2022,6 +2028,8 @@ 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