ITS#7040 don't complain about other server's CSNs

Only worry if consumer has newer state for our SID. Fixes breakage
caused by ITS#6606.

diff --git a/servers/slapd/overlays/syncprov.c b/servers/slapd/overlays/syncprov.c
index 7114eb90f895527c08fd6af0d03bc4a416b43e8e..e5bedd4690562eeeed6b989e839ebf0a5158c8fb 100644 (file)
--- a/servers/slapd/overlays/syncprov.c
+++ b/servers/slapd/overlays/syncprov.c
@@ -2583,7 +2583,7 @@ syncprov_op_search( Operation *op, SlapReply *rs )
                                        mincsn = srs->sr_state.ctxcsn[i];
                                        minsid = sids[j];
                                }
-                       } else if ( newer > 0 ) {
+                       } else if ( newer > 0 && sids[j] == slap_serverID ) {
                        /* our state is older, complain to consumer */
                                rs->sr_err = LDAP_UNWILLING_TO_PERFORM;
                                rs->sr_text = "consumer state is newer than provider!";