From: Howard Chu <hyc@openldap.org>
Date: Mon, 13 Feb 2012 05:07:25 +0000 (-0800)
Subject: ITS#7162 Revert "ITS#7052 ignore Adds with too old entryCSN"
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=eace24ef33dfae071b9450866d0ef5b0d3ad6d7f;p=openldap

ITS#7162 Revert "ITS#7052 ignore Adds with too old entryCSN"

This reverts commit ba4366eae098c0e4950a78b1da8d79ffe8b34fee.
The patch caused a regression (ITS#7162).
---

diff --git a/servers/slapd/syncrepl.c b/servers/slapd/syncrepl.c
index c218114349..ff13ff9075 100644
--- a/servers/slapd/syncrepl.c
+++ b/servers/slapd/syncrepl.c
@@ -2827,23 +2827,6 @@ syncrepl_entry(
 				 */
 				op->o_csn = a->a_vals[0];
 				freecsn = 0;
-				/* There was no cookie CSN attached to this op,
-				 * make sure it's new enough
-				 */
-				if ( !syncCSN ) {
-					int i, sid = slap_parse_csn_sid( &a->a_vals[0] );
-					for ( i = 0; i<si->si_cookieState->cs_num; i++ ) {
-						if ( sid < si->si_cookieState->cs_sids[i] )
-							break;
-						if ( sid == si->si_cookieState->cs_sids[i] ) {
-							if ( ber_bvcmp( &a->a_vals[0], &si->si_cookieState->cs_vals[i] ) <= 0 ) {
-								Debug( LDAP_DEBUG_SYNC, "do_syncrep2: %s entryCSN too old, ignoring %s (%s)\n",
-								si->si_ridtxt, a->a_vals[0].bv_val, entry->e_name.bv_val );
-								goto done;
-							}
-						}
-					}
-				}
 			}
 		}
 retry_add:;