From: Jong Hyuk Choi <jongchoi@openldap.org>
Date: Fri, 3 Sep 2004 12:16:15 +0000 (+0000)
Subject: fix for test019 glitch
X-Git-Tag: OPENLDAP_REL_ENG_2_3_0ALPHA~578
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=76dfffafe41411fc08ddb79a20132ebd7d747875;p=openldap

fix for test019 glitch
---

diff --git a/servers/slapd/back-bdb/delete.c b/servers/slapd/back-bdb/delete.c
index 7843d632c7..18b0c0b1b9 100644
--- a/servers/slapd/back-bdb/delete.c
+++ b/servers/slapd/back-bdb/delete.c
@@ -585,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,
-					&op->ord_csn, NULL );
+					&op->o_sync_csn, NULL );
 				} else {
-					a->a_vals[0] = op->ord_csn;
+					a->a_vals[0] = op->o_sync_csn;
 				}
 			} else {
 				/* Hm, the entryCSN ought to exist. ??? */
diff --git a/servers/slapd/delete.c b/servers/slapd/delete.c
index 8e2009bb4f..1cd435201d 100644
--- a/servers/slapd/delete.c
+++ b/servers/slapd/delete.c
@@ -228,11 +228,12 @@ 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 ) {
-				slap_get_csn( op, csnbuf, sizeof(csnbuf), &op->ord_csn, 1 );
+				struct berval csn = BER_BVNULL;
+				char csnbuf[LDAP_LUTIL_CSNSTR_BUFSIZE];
+				slap_get_csn( op, csnbuf, sizeof(csnbuf), &csn, 1 );
 			}
 
 #ifdef SLAPD_MULTIMASTER
diff --git a/servers/slapd/slap.h b/servers/slapd/slap.h
index d02b47a938..cab135a846 100644
--- a/servers/slapd/slap.h
+++ b/servers/slapd/slap.h
@@ -1685,10 +1685,6 @@ 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;
@@ -2066,7 +2062,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;
@@ -2080,7 +2075,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
@@ -2115,7 +2109,6 @@ 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