From 198cbd6ea819162cb2573de7efc55bac63e31f1f Mon Sep 17 00:00:00 2001 From: Howard Chu Date: Thu, 19 Nov 2009 11:17:53 +0000 Subject: [PATCH] ITS#6368 partially revert 1.273, always check for skips, not just on first matchops call --- servers/slapd/overlays/syncprov.c | 26 +++++++++++--------------- 1 file changed, 11 insertions(+), 15 deletions(-) diff --git a/servers/slapd/overlays/syncprov.c b/servers/slapd/overlays/syncprov.c index a7e93cc336..dcaf6887de 100644 --- a/servers/slapd/overlays/syncprov.c +++ b/servers/slapd/overlays/syncprov.c @@ -1198,22 +1198,18 @@ syncprov_matchops( Operation *op, opcookie *opc, int saveit ) if ( ss->s_op->o_abandon ) continue; - /* First time thru, check for possible skips */ - if ( saveit || op->o_tag == LDAP_REQ_ADD ) { - - /* Don't send ops back to the originator */ - if ( opc->osid > 0 && opc->osid == ss->s_sid ) { - Debug( LDAP_DEBUG_SYNC, "syncprov_matchops: skipping original sid %03x\n", - opc->osid, 0, 0 ); - continue; - } + /* Don't send ops back to the originator */ + if ( opc->osid > 0 && opc->osid == ss->s_sid ) { + Debug( LDAP_DEBUG_SYNC, "syncprov_matchops: skipping original sid %03x\n", + opc->osid, 0, 0 ); + continue; + } - /* Don't send ops back to the messenger */ - if ( opc->rsid > 0 && opc->rsid == ss->s_sid ) { - Debug( LDAP_DEBUG_SYNC, "syncprov_matchops: skipping relayed sid %03x\n", - opc->rsid, 0, 0 ); - continue; - } + /* Don't send ops back to the messenger */ + if ( opc->rsid > 0 && opc->rsid == ss->s_sid ) { + Debug( LDAP_DEBUG_SYNC, "syncprov_matchops: skipping relayed sid %03x\n", + opc->rsid, 0, 0 ); + continue; } /* validate base */ -- 2.39.5