]> git.sur5r.net Git - openldap/commitdiff
ITS#7162 Revert "ITS#7052 ignore Adds with too old entryCSN"
authorHoward Chu <hyc@openldap.org>
Mon, 13 Feb 2012 05:07:25 +0000 (21:07 -0800)
committerHoward Chu <hyc@openldap.org>
Mon, 13 Feb 2012 05:07:25 +0000 (21:07 -0800)
This reverts commit ba4366eae098c0e4950a78b1da8d79ffe8b34fee.
The patch caused a regression (ITS#7162).

servers/slapd/syncrepl.c

index c2181143493a60f00889b3f52658fe8c7dfb8e85..ff13ff90756725faae8410ffff265593a9f01b04 100644 (file)
@@ -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:;