From: Quanah Gibson-Mount <quanah@openldap.org>
Date: Wed, 18 Nov 2009 22:22:16 +0000 (+0000)
Subject: ITS#6368
X-Git-Tag: OPENLDAP_REL_ENG_2_4_20~35
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=771c1f62e07860dd2bad8955db04b4e8616bcb9f;p=openldap

ITS#6368
---

diff --git a/CHANGES b/CHANGES
index b3d337be89..03c97ce5ff 100644
--- a/CHANGES
+++ b/CHANGES
@@ -20,6 +20,7 @@ OpenLDAP 2.4.20 Engineering
 	Fixed slapd invalid dn log message (ITS#6309)
 	Fixed slapd lockup on shutdown (ITS#6372)
 	Fixed slapd sl_free to better reclaim memory (ITS#6380)
+	Fixed slapd syncrepl deletes in MirorMode (ITS#6368)
 	Fixed slapd syncrepl to use correct SID (ITS#6367)
 	Fixed slapd termination for one level DNs (ITS#6338)
 	Fixed slapd tls_accept to retry in certain cases (ITS#6304)
diff --git a/servers/slapd/syncrepl.c b/servers/slapd/syncrepl.c
index ffefe52e81..7a4e6d4118 100644
--- a/servers/slapd/syncrepl.c
+++ b/servers/slapd/syncrepl.c
@@ -857,6 +857,7 @@ do_syncrep2(
 					slap_parse_sync_cookie( &syncCookie, NULL );
 					if ( syncCookie.ctxcsn ) {
 						int i, sid = slap_parse_csn_sid( syncCookie.ctxcsn );
+						check_syncprov( op, si );
 						for ( i =0; i<si->si_cookieState->cs_num; i++ ) {
 							if ( si->si_cookieState->cs_sids[i] == sid && 
 								ber_bvcmp( syncCookie.ctxcsn, &si->si_cookieState->cs_vals[i] ) <= 0 ) {