From: Howard Chu <hyc@openldap.org>
Date: Fri, 30 Sep 2011 10:04:10 +0000 (-0700)
Subject: ITS#7040 don't complain about other server's CSNs
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=da210f40e1c0c7761cb392c0772357bbc4a96cb8;p=openldap

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 7114eb90f8..e5bedd4690 100644
--- 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!";