]> git.sur5r.net Git - openldap/commitdiff
ITS#8800 remove originator check in syncprov_search_response
authorHoward Chu <hyc@openldap.org>
Fri, 2 Feb 2018 00:47:25 +0000 (00:47 +0000)
committerQuanah Gibson-Mount <quanah@openldap.org>
Fri, 9 Feb 2018 18:25:17 +0000 (18:25 +0000)
Let the entryCSN check do all the work. Reloading a server from an old
backup needs this to go thru.

servers/slapd/overlays/syncprov.c

index 418ac821c915516d8f5d1fcf4ef1f8ff3940150a..e4d363d36b5742f6d17083877de154368988a1b8 100644 (file)
@@ -2376,14 +2376,6 @@ syncprov_search_response( Operation *op, SlapReply *rs )
                        int i, sid;
                        sid = slap_parse_csn_sid( &a->a_nvals[0] );
 
-                       /* Don't send changed entries back to the originator */
-                       if ( sid == srs->sr_state.sid && srs->sr_state.numcsns ) {
-                               Debug( LDAP_DEBUG_SYNC,
-                                       "Entry %s changed by peer, ignored\n",
-                                       rs->sr_entry->e_name.bv_val, 0, 0 );
-                               return LDAP_SUCCESS;
-                       }
-
                        /* If not a persistent search */
                        if ( !ss->ss_so ) {
                                /* Make sure entry is less than the snapshot'd contextCSN */