From: Howard Chu <hyc@openldap.org>
Date: Mon, 11 Feb 2008 00:19:43 +0000 (+0000)
Subject: ITS#5367 revert prev commit
X-Git-Tag: OPENLDAP_REL_ENG_2_4_9~20^2~170
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=525f266d10fb59782ee6ec56740b61516021c404;p=openldap

ITS#5367 revert prev commit
---

diff --git a/servers/slapd/overlays/syncprov.c b/servers/slapd/overlays/syncprov.c
index bfd6ffb7fc..ad8b9bb329 100644
--- a/servers/slapd/overlays/syncprov.c
+++ b/servers/slapd/overlays/syncprov.c
@@ -1566,12 +1566,6 @@ syncprov_op_response( Operation *op, SlapReply *rs )
 		char cbuf[LDAP_LUTIL_CSNSTR_BUFSIZE];
 		int do_check = 0, have_psearches;
 
-		/* Don't do any processing for consumer contextCSN updates */
-		if ( SLAP_SYNC_SHADOW( op->o_bd ) && 
-			op->o_msgid == SLAP_SYNC_UPDATE_MSGID ) {
-			return SLAP_CB_CONTINUE;
-		}
-
 		/* Update our context CSN */
 		cbuf[0] = '\0';
 		ldap_pvt_thread_rdwr_wlock( &si->si_csn_rwlock );
@@ -1598,6 +1592,13 @@ syncprov_op_response( Operation *op, SlapReply *rs )
 			}
 		}
 
+		/* Don't do any processing for consumer contextCSN updates */
+		if ( SLAP_SYNC_SHADOW( op->o_bd ) && 
+			op->o_msgid == SLAP_SYNC_UPDATE_MSGID ) {
+			ldap_pvt_thread_rdwr_wunlock( &si->si_csn_rwlock );
+			return SLAP_CB_CONTINUE;
+		}
+
 		si->si_numops++;
 		if ( si->si_chkops || si->si_chktime ) {
 			if ( si->si_chkops && si->si_numops >= si->si_chkops ) {