From: Kurt Zeilenga <kurt@openldap.org>
Date: Mon, 13 Feb 2006 20:04:45 +0000 (+0000)
Subject: +       Fixed slapd syncrepl de-normalize UUID issue
X-Git-Tag: OPENLDAP_REL_ENG_2_3_20~25
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=6fdf4ef7029852414ada2921c84d81acd09e9aec;p=openldap

+       Fixed slapd syncrepl de-normalize UUID issue
+       Added slapd syncrepl log messages (ITS#4369)
---

diff --git a/CHANGES b/CHANGES
index 424dfd52f1..d364c2ed2b 100644
--- a/CHANGES
+++ b/CHANGES
@@ -5,6 +5,8 @@ OpenLDAP 2.3.20 Engineering
 	Fixed slapd config_generic_wrapper missing parameter bug (ITS#4376)
 	Fixed slapd extensible filter value normalization bug (ITS#4380)
 	Fixed slapd non-read/write epoll event handling (ITS#4395)
+	Fixed slapd syncrepl de-normalize UUID issue
+	Added slapd syncrepl log messages (ITS#4369)
 	Fixed slapd-bdb/hdb wake listener on runqueue submit (ITS#4385)
 	Fixed slapo-auditlog crash (ITS#4394)
 	Fixed slapo-accesslog unbind crash (ITS#4386)
diff --git a/servers/slapd/syncrepl.c b/servers/slapd/syncrepl.c
index d587c2a289..a5b2c194d9 100644
--- a/servers/slapd/syncrepl.c
+++ b/servers/slapd/syncrepl.c
@@ -2030,8 +2030,12 @@ syncrepl_del_nonpresent(
 
 		for (i=0; uuids[i].bv_val; i++) {
 			op->ors_slimit = 1;
+			slap_uuidstr_from_normalized( &uf.f_av_value, &uuids[i],
+				op->o_tmpmemctx );
+			filter2bv_x( op, op->ors_filter, &op->ors_filterstr );
 			uf.f_av_value = uuids[i];
 			rc = be->be_search( op, &rs_search );
+			op->o_tmpfree( op->ors_filterstr.bv_val, op->o_tmpmemctx );
 		}
 		si->si_refreshDelete ^= NP_DELETE_ONE;
 	} else {
@@ -2069,6 +2073,9 @@ syncrepl_del_nonpresent(
 			op->o_req_dn = *np_prev->npe_name;
 			op->o_req_ndn = *np_prev->npe_nname;
 			rc = op->o_bd->be_delete( op, &rs_delete );
+			Debug( LDAP_DEBUG_SYNC,
+				"syncrepl_del_nonpresent: be_delete %s (%d)\n", 
+				op->o_req_dn.bv_val, rc, 0 );
 
 			if ( rs_delete.sr_err == LDAP_NOT_ALLOWED_ON_NONLEAF ) {
 				Modifications mod1, mod2;