--- servers/slapd/overlays/syncprov.c	2009/02/17 00:06:01	1.147.2.45
+++ servers/slapd/overlays/syncprov.c	2007/09/23 02:40:17	1.198
@@ -1,8 +1,8 @@
-/* $OpenLDAP: pkg/ldap/servers/slapd/overlays/syncprov.c,v 1.147.2.44 2009/01/30 18:49:57 quanah Exp $ */
+/* $OpenLDAP: pkg/ldap/servers/slapd/overlays/syncprov.c,v 1.197 2007/09/21 06:43:57 hyc Exp $ */
 /* syncprov.c - syncrepl provider */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 2004-2009 The OpenLDAP Foundation.
+ * Copyright 2004-2007 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -28,10 +28,6 @@
 #include "config.h"
 #include "ldap_rq.h"
 
-#ifdef LDAP_DEVEL
-#define	CHECK_CSN	1
-#endif
-
 /* A modify request on a particular entry */
 typedef struct modinst {
 	struct modinst *mi_next;
@@ -397,6 +393,9 @@ static struct berval generic_filterstr =
 static int
 syncprov_findbase( Operation *op, fbase_cookie *fc )
 {
+	opcookie *opc = op->o_callback->sc_private;
+	slap_overinst *on = opc->son;
+
 	/* Use basic parameters from syncrepl search, but use
 	 * current op's threadctx / tmpmemctx
 	 */
@@ -405,6 +404,7 @@ syncprov_findbase( Operation *op, fbase_
 		slap_callback cb = {0};
 		Operation fop;
 		SlapReply frs = { REP_RESULT };
+		BackendInfo *bi;
 		int rc;
 
 		fc->fss->s_flags ^= PS_FIND_BASE;
@@ -412,10 +412,11 @@ syncprov_findbase( Operation *op, fbase_
 
 		fop = *fc->fss->s_op;
 
-		fop.o_bd = fop.o_bd->bd_self;
 		fop.o_hdr = op->o_hdr;
+		fop.o_bd = op->o_bd;
 		fop.o_time = op->o_time;
 		fop.o_tincr = op->o_tincr;
+		bi = op->o_bd->bd_info;
 
 		cb.sc_response = findbase_cb;
 		cb.sc_private = fc;
@@ -433,7 +434,8 @@ syncprov_findbase( Operation *op, fbase_
 		fop.ors_filter = &generic_filter;
 		fop.ors_filterstr = generic_filterstr;
 
-		rc = fop.o_bd->be_search( &fop, &frs );
+		rc = overlay_op_walk( &fop, &frs, op_search, on->on_info, on );
+		op->o_bd->bd_info = bi;
 	} else {
 		ldap_pvt_thread_mutex_unlock( &fc->fss->s_mutex );
 		fc->fbase = 1;
@@ -498,8 +500,7 @@ findmax_cb( Operation *op, SlapReply *rs
 		Attribute *a = attr_find( rs->sr_entry->e_attrs,
 			slap_schema.si_ad_entryCSN );
 
-		if ( a && ber_bvcmp( &a->a_vals[0], maxcsn ) > 0 &&
-			slap_parse_csn_sid( &a->a_vals[0] ) == slap_serverID ) {
+		if ( a && ber_bvcmp( &a->a_vals[0], maxcsn ) > 0 ) {
 			maxcsn->bv_len = a->a_vals[0].bv_len;
 			strcpy( maxcsn->bv_val, a->a_vals[0].bv_val );
 		}
@@ -589,7 +590,7 @@ syncprov_findcsn( Operation *op, find_cs
 	sync_control *srs = NULL;
 	struct slap_limits_set fc_limits;
 	int i, rc = LDAP_SUCCESS, findcsn_retry = 1;
-	int maxid;
+	int maxid = 0;
 
 	if ( mode != FIND_MAXCSN ) {
 		srs = op->o_controls[slap_cids.sc_LDAPsync];
@@ -615,25 +616,16 @@ again:
 	switch( mode ) {
 	case FIND_MAXCSN:
 		cf.f_choice = LDAP_FILTER_GE;
-		/* If there are multiple CSNs, use the one with our serverID */
-		for ( i=0; i<si->si_numcsns; i++) {
-			if ( slap_serverID == si->si_sids[i] ) {
+		cf.f_av_value = si->si_ctxcsn[0];
+		/* If there are multiple CSNs, use the largest */
+		for ( i=1; i<si->si_numcsns; i++) {
+			if ( ber_bvcmp( &cf.f_av_value, &si->si_ctxcsn[i] ) < 0 ) {
+				cf.f_av_value = si->si_ctxcsn[i];
 				maxid = i;
-				break;
 			}
 		}
-		if ( i == si->si_numcsns ) {
-			/* No match: this is multimaster, and none of the content in the DB
-			 * originated locally. Treat like no CSN.
-			 */
-			return LDAP_NO_SUCH_OBJECT;
-		}
-		cf.f_av_value = si->si_ctxcsn[maxid];
-		fop.ors_filterstr.bv_len = snprintf( buf, sizeof( buf ),
-			"(entryCSN>=%s)", cf.f_av_value.bv_val );
-		if ( fop.ors_filterstr.bv_len >= sizeof( buf ) ) {
-			return LDAP_OTHER;
-		}
+		fop.ors_filterstr.bv_len = sprintf( buf, "(entryCSN>=%s)",
+			cf.f_av_value.bv_val );
 		fop.ors_attrsonly = 0;
 		fop.ors_attrs = csn_anlist;
 		fop.ors_slimit = SLAP_NO_LIMIT;
@@ -657,19 +649,16 @@ again:
 		/* Look for exact match the first time */
 		if ( findcsn_retry ) {
 			cf.f_choice = LDAP_FILTER_EQUALITY;
-			fop.ors_filterstr.bv_len = snprintf( buf, sizeof( buf ),
-				"(entryCSN=%s)", cf.f_av_value.bv_val );
+			fop.ors_filterstr.bv_len = sprintf( buf, "(entryCSN=%s)",
+				cf.f_av_value.bv_val );
 		/* On retry, look for <= */
 		} else {
 			cf.f_choice = LDAP_FILTER_LE;
 			fop.ors_limit = &fc_limits;
 			memset( &fc_limits, 0, sizeof( fc_limits ));
 			fc_limits.lms_s_unchecked = 1;
-			fop.ors_filterstr.bv_len = snprintf( buf, sizeof( buf ),
-				"(entryCSN<=%s)", cf.f_av_value.bv_val );
-		}
-		if ( fop.ors_filterstr.bv_len >= sizeof( buf ) ) {
-			return LDAP_OTHER;
+			fop.ors_filterstr.bv_len = sprintf( buf, "(entryCSN<=%s)",
+				cf.f_av_value.bv_val );
 		}
 		fop.ors_attrsonly = 1;
 		fop.ors_attrs = slap_anlist_no_attrs;
@@ -701,17 +690,13 @@ again:
 		break;
 	}
 
-	fop.o_bd->bd_info = (BackendInfo *)on->on_info;
+	fop.o_bd->bd_info = on->on_info->oi_orig;
 	fop.o_bd->be_search( &fop, &frs );
 	fop.o_bd->bd_info = (BackendInfo *)on;
 
 	switch( mode ) {
 	case FIND_MAXCSN:
 		if ( ber_bvcmp( &si->si_ctxcsn[maxid], &maxcsn )) {
-#ifdef CHECK_CSN
-			Syntax *syn = slap_schema.si_ad_contextCSN->ad_type->sat_syntax;
-			assert( !syn->ssyn_validate( syn, &maxcsn ));
-#endif
 			ber_bvreplace( &si->si_ctxcsn[maxid], &maxcsn );
 			si->si_numops++;	/* ensure a checkpoint */
 		}
@@ -746,13 +731,6 @@ syncprov_free_syncop( syncops *so )
 		ldap_pvt_thread_mutex_unlock( &so->s_mutex );
 		return;
 	}
-	if ( so->s_qtask ) {
-		ldap_pvt_thread_mutex_lock( &slapd_rq.rq_mutex );
-		if ( ldap_pvt_runqueue_isrunning( &slapd_rq, so->s_qtask ) )
-			ldap_pvt_runqueue_stoptask( &slapd_rq, so->s_qtask );
-		ldap_pvt_runqueue_remove( &slapd_rq, so->s_qtask );
-		ldap_pvt_thread_mutex_unlock( &slapd_rq.rq_mutex );
-	}
 	ldap_pvt_thread_mutex_unlock( &so->s_mutex );
 	if ( so->s_flags & PS_IS_DETACHED ) {
 		filter_free( so->s_op->ors_filter );
@@ -792,8 +770,6 @@ syncprov_sendresp( Operation *op, opcook
 	BER_BVZERO( &csns[1] );
 	slap_compose_sync_cookie( op, &cookie, csns, so->s_rid, so->s_sid );
 
-	Debug( LDAP_DEBUG_SYNC, "syncprov_sendresp: cookie=%s\n", cookie.bv_val, 0, 0 );
-
 	e_uuid.e_attrs = &a_uuid;
 	a_uuid.a_desc = slap_schema.si_ad_entryUUID;
 	a_uuid.a_nvals = &opc->suuid;
@@ -808,7 +784,7 @@ syncprov_sendresp( Operation *op, opcook
 		rs.sr_entry = *e;
 		if ( rs.sr_entry->e_private )
 			rs.sr_flags = REP_ENTRY_MUSTRELEASE;
-		if ( opc->sreference && so->s_op->o_managedsait <= SLAP_CONTROL_IGNORED ) {
+		if ( opc->sreference ) {
 			rs.sr_ref = get_entry_referrals( op, rs.sr_entry );
 			rs.sr_err = send_search_reference( op, &rs );
 			ber_bvarray_free( rs.sr_ref );
@@ -831,7 +807,7 @@ syncprov_sendresp( Operation *op, opcook
 		e_uuid.e_name = opc->sdn;
 		e_uuid.e_nname = opc->sndn;
 		rs.sr_entry = &e_uuid;
-		if ( opc->sreference && so->s_op->o_managedsait <= SLAP_CONTROL_IGNORED ) {
+		if ( opc->sreference ) {
 			struct berval bv = BER_BVNULL;
 			rs.sr_ref = &bv;
 			rs.sr_err = send_search_reference( op, &rs );
@@ -853,10 +829,8 @@ syncprov_sendresp( Operation *op, opcook
 
 /* Play back queued responses */
 static int
-syncprov_qplay( Operation *op, struct re_s *rtask )
+syncprov_qplay( Operation *op, slap_overinst *on, syncops *so )
 {
-	syncops *so = rtask->arg;
-	slap_overinst *on = LDAP_SLIST_FIRST(&so->s_op->o_extra)->oe_key;
 	syncres *sr;
 	Entry *e;
 	opcookie opc;
@@ -871,10 +845,10 @@ syncprov_qplay( Operation *op, struct re
 			so->s_res = sr->s_next;
 		if ( !so->s_res )
 			so->s_restail = NULL;
-		/* Exit loop with mutex held */
+		ldap_pvt_thread_mutex_unlock( &so->s_mutex );
+
 		if ( !sr || so->s_op->o_abandon )
 			break;
-		ldap_pvt_thread_mutex_unlock( &so->s_mutex );
 
 		opc.sdn = sr->s_dn;
 		opc.sndn = sr->s_ndn;
@@ -901,28 +875,9 @@ syncprov_qplay( Operation *op, struct re
 
 		ch_free( sr );
 
-		if ( rc ) {
-			/* Exit loop with mutex held */
-			ldap_pvt_thread_mutex_lock( &so->s_mutex );
+		if ( rc )
 			break;
-		}
 	}
-
-	/* wait until we get explicitly scheduled again */
-	ldap_pvt_thread_mutex_lock( &slapd_rq.rq_mutex );
-	ldap_pvt_runqueue_stoptask( &slapd_rq, rtask );
-	if ( rc == 0 ) {
-		ldap_pvt_runqueue_resched( &slapd_rq, rtask, 1 );
-	} else {
-		/* bail out on any error */
-		ldap_pvt_runqueue_remove( &slapd_rq, rtask );
-
-		/* Prevent duplicate remove */
-		if ( so->s_qtask == rtask )
-			so->s_qtask = NULL;
-	}
-	ldap_pvt_thread_mutex_unlock( &slapd_rq.rq_mutex );
-	ldap_pvt_thread_mutex_unlock( &so->s_mutex );
 	return rc;
 }
 
@@ -932,6 +887,7 @@ syncprov_qtask( void *ctx, void *arg )
 {
 	struct re_s *rtask = arg;
 	syncops *so = rtask->arg;
+	slap_overinst *on = so->s_op->o_private;
 	OperationBuffer opbuf;
 	Operation *op;
 	BackendDB be;
@@ -953,14 +909,25 @@ syncprov_qtask( void *ctx, void *arg )
 	be = *so->s_op->o_bd;
 	be.be_flags |= SLAP_DBFLAG_OVERLAY;
 	op->o_bd = &be;
-	LDAP_SLIST_FIRST(&op->o_extra) = NULL;
+	op->o_private = NULL;
 	op->o_callback = NULL;
 
-	rc = syncprov_qplay( op, rtask );
+	rc = syncprov_qplay( op, on, so );
 
 	/* decrement use count... */
 	syncprov_free_syncop( so );
 
+	/* wait until we get explicitly scheduled again */
+	ldap_pvt_thread_mutex_lock( &slapd_rq.rq_mutex );
+	ldap_pvt_runqueue_stoptask( &slapd_rq, rtask );
+	if ( rc == 0 ) {
+		ldap_pvt_runqueue_resched( &slapd_rq, rtask, 1 );
+	} else {
+		/* bail out on any error */
+		ldap_pvt_runqueue_remove( &slapd_rq, rtask );
+	}
+	ldap_pvt_thread_mutex_unlock( &slapd_rq.rq_mutex );
+
 #if 0	/* FIXME: connection_close isn't exported from slapd.
 		 * should it be?
 		 */
@@ -1007,18 +974,15 @@ static int
 syncprov_qresp( opcookie *opc, syncops *so, int mode )
 {
 	syncres *sr;
-	int sid, srsize;
+	int sid;
 
 	/* Don't send changes back to their originator */
 	sid = slap_parse_csn_sid( &opc->sctxcsn );
 	if ( sid >= 0 && sid == so->s_sid )
 		return LDAP_SUCCESS;
 
-	srsize = sizeof(syncres) + opc->suuid.bv_len + 1 +
-		opc->sdn.bv_len + 1 + opc->sndn.bv_len + 1;
-	if ( opc->sctxcsn.bv_len )
-		srsize += opc->sctxcsn.bv_len + 1;
-	sr = ch_malloc( srsize );
+	sr = ch_malloc(sizeof(syncres) + opc->suuid.bv_len + 1 +
+		opc->sdn.bv_len + 1 + opc->sndn.bv_len + 1 + opc->sctxcsn.bv_len + 1 );
 	sr->s_next = NULL;
 	sr->s_dn.bv_val = (char *)(sr + 1);
 	sr->s_dn.bv_len = opc->sdn.bv_len;
@@ -1031,13 +995,9 @@ syncprov_qresp( opcookie *opc, syncops *
 		 opc->sndn.bv_val ) + 1;
 	sr->s_uuid.bv_len = opc->suuid.bv_len;
 	AC_MEMCPY( sr->s_uuid.bv_val, opc->suuid.bv_val, opc->suuid.bv_len );
-	if ( opc->sctxcsn.bv_len ) {
-		sr->s_csn.bv_val = sr->s_uuid.bv_val + sr->s_uuid.bv_len + 1;
-		strcpy( sr->s_csn.bv_val, opc->sctxcsn.bv_val );
-	} else {
-		sr->s_csn.bv_val = NULL;
-	}
+	sr->s_csn.bv_val = sr->s_uuid.bv_val + sr->s_uuid.bv_len + 1;
 	sr->s_csn.bv_len = opc->sctxcsn.bv_len;
+	strcpy( sr->s_csn.bv_val, opc->sctxcsn.bv_val );
 
 	ldap_pvt_thread_mutex_lock( &so->s_mutex );
 	if ( !so->s_res ) {
@@ -1189,15 +1149,10 @@ syncprov_matchops( Operation *op, opcook
 	for (ss = si->si_ops, sprev = (syncops *)&si->si_ops; ss;
 		sprev = ss, ss=snext)
 	{
-		Operation op2;
-		Opheader oh;
 		syncmatches *sm;
 		int found = 0;
 
 		snext = ss->s_next;
-		if ( ss->s_op->o_abandon )
-			continue;
-
 		/* validate base */
 		fc.fss = ss;
 		fc.fbase = 0;
@@ -1238,17 +1193,8 @@ syncprov_matchops( Operation *op, opcook
 			}
 		}
 
-		if ( fc.fscope ) {
-			op2 = *ss->s_op;
-			oh = *op->o_hdr;
-			oh.oh_conn = ss->s_op->o_conn;
-			oh.oh_connid = ss->s_op->o_connid;
-			op2.o_hdr = &oh;
-			op2.o_extra = op->o_extra;
-		}
-
 		/* check if current o_req_dn is in scope and matches filter */
-		if ( fc.fscope && test_filter( &op2, e, ss->s_op->ors_filter ) ==
+		if ( fc.fscope && test_filter( op, e, ss->s_op->ors_filter ) ==
 			LDAP_COMPARE_TRUE ) {
 			if ( saveit ) {
 				sm = op->o_tmpalloc( sizeof(syncmatches), op->o_tmpmemctx );
@@ -1267,12 +1213,6 @@ syncprov_matchops( Operation *op, opcook
 			/* send DELETE */
 			syncprov_qresp( opc, ss, LDAP_SYNC_DELETE );
 		}
-		if ( !saveit && found ) {
-			/* Decrement s_inuse, was incremented when called
-			 * with saveit == TRUE
-			 */
-			syncprov_free_syncop( ss );
-		}
 	}
 	ldap_pvt_thread_mutex_unlock( &si->si_ops_mutex );
 
@@ -1346,21 +1286,12 @@ syncprov_checkpoint( Operation *op, Slap
 	Operation opm;
 	SlapReply rsm = { 0 };
 	slap_callback cb = {0};
-	BackendDB be;
-#ifdef CHECK_CSN
-	Syntax *syn = slap_schema.si_ad_contextCSN->ad_type->sat_syntax;
 
-	int i;
-	for ( i=0; i<si->si_numcsns; i++ ) {
-		assert( !syn->ssyn_validate( syn, si->si_ctxcsn+i ));
-	}
-#endif
-	mod.sml_numvals = si->si_numcsns;
 	mod.sml_values = si->si_ctxcsn;
 	mod.sml_nvalues = NULL;
 	mod.sml_desc = slap_schema.si_ad_contextCSN;
 	mod.sml_op = LDAP_MOD_REPLACE;
-	mod.sml_flags = SLAP_MOD_INTERNAL;
+	mod.sml_flags = 0;
 	mod.sml_next = NULL;
 
 	cb.sc_response = slap_null_cb;
@@ -1369,12 +1300,8 @@ syncprov_checkpoint( Operation *op, Slap
 	opm.o_callback = &cb;
 	opm.orm_modlist = &mod;
 	opm.orm_no_opattrs = 1;
-	if ( SLAP_GLUE_SUBORDINATE( op->o_bd )) {
-		be = *on->on_info->oi_origdb;
-		opm.o_bd = &be;
-	}
-	opm.o_req_dn = opm.o_bd->be_suffix[0];
-	opm.o_req_ndn = opm.o_bd->be_nsuffix[0];
+	opm.o_req_dn = op->o_bd->be_suffix[0];
+	opm.o_req_ndn = op->o_bd->be_nsuffix[0];
 	opm.o_bd->bd_info = on->on_info->oi_orig;
 	opm.o_managedsait = SLAP_CONTROL_NONCRITICAL;
 	opm.o_no_schema_check = 1;
@@ -1382,11 +1309,7 @@ syncprov_checkpoint( Operation *op, Slap
 	if ( mod.sml_next != NULL ) {
 		slap_mods_free( mod.sml_next, 1 );
 	}
-#ifdef CHECK_CSN
-	for ( i=0; i<si->si_numcsns; i++ ) {
-		assert( !syn->ssyn_validate( syn, si->si_ctxcsn+i ));
-	}
-#endif
+	opm.orm_no_opattrs = 0;
 }
 
 static void
@@ -1580,7 +1503,7 @@ syncprov_playlog( Operation *op, SlapRep
 		fop.ors_filter = &af;
 
 		cb.sc_response = playlog_cb;
-		fop.o_bd->bd_info = (BackendInfo *)on->on_info;
+		fop.o_bd->bd_info = on->on_info->oi_orig;
 
 		for ( i=ndel; i<num; i++ ) {
 			if ( uuids[i].bv_len == 0 ) continue;
@@ -1601,19 +1524,11 @@ syncprov_playlog( Operation *op, SlapRep
 	if ( ndel ) {
 		struct berval cookie;
 
-		if ( delcsn[0].bv_len ) {
-			slap_compose_sync_cookie( op, &cookie, delcsn, srs->sr_state.rid,
-				srs->sr_state.sid );
-
-			Debug( LDAP_DEBUG_SYNC, "syncprov_playlog: cookie=%s\n", cookie.bv_val, 0, 0 );
-		}
-
+		slap_compose_sync_cookie( op, &cookie, delcsn, srs->sr_state.rid,
+			srs->sr_state.sid );
 		uuids[ndel].bv_val = NULL;
-		syncprov_sendinfo( op, rs, LDAP_TAG_SYNC_ID_SET,
-			delcsn[0].bv_len ? &cookie : NULL, 0, uuids, 1 );
-		if ( delcsn[0].bv_len ) {
-			op->o_tmpfree( cookie.bv_val, op->o_tmpmemctx );
-		}
+		syncprov_sendinfo( op, rs, LDAP_TAG_SYNC_ID_SET, &cookie, 0, uuids, 1 );
+		op->o_tmpfree( cookie.bv_val, op->o_tmpmemctx );
 	}
 	op->o_tmpfree( uuids, op->o_tmpmemctx );
 }
@@ -1628,35 +1543,17 @@ syncprov_op_response( Operation *op, Sla
 
 	if ( rs->sr_err == LDAP_SUCCESS )
 	{
-		struct berval maxcsn;
+		struct berval maxcsn = BER_BVNULL;
 		char cbuf[LDAP_LUTIL_CSNSTR_BUFSIZE];
-		int do_check = 0, have_psearches, foundit;
+		int do_check = 0;
 
 		/* Update our context CSN */
 		cbuf[0] = '\0';
-		maxcsn.bv_val = cbuf;
-		maxcsn.bv_len = sizeof(cbuf);
 		ldap_pvt_thread_rdwr_wlock( &si->si_csn_rwlock );
-		slap_get_commit_csn( op, &maxcsn, &foundit );
-		if ( BER_BVISEMPTY( &maxcsn ) && SLAP_GLUE_SUBORDINATE( op->o_bd )) {
-			/* syncrepl queues the CSN values in the db where
-			 * it is configured , not where the changes are made.
-			 * So look for a value in the glue db if we didn't
-			 * find any in this db.
-			 */
-			BackendDB *be = op->o_bd;
-			op->o_bd = select_backend( &be->be_nsuffix[0], 1);
-			maxcsn.bv_val = cbuf;
-			maxcsn.bv_len = sizeof(cbuf);
-			slap_get_commit_csn( op, &maxcsn, &foundit );
-			op->o_bd = be;
-		}
-		if ( !BER_BVISEMPTY( &maxcsn ) ) {
+		slap_get_commit_csn( op, &maxcsn );
+		if ( !BER_BVISNULL( &maxcsn ) ) {
 			int i, sid;
-#ifdef CHECK_CSN
-			Syntax *syn = slap_schema.si_ad_contextCSN->ad_type->sat_syntax;
-			assert( !syn->ssyn_validate( syn, &maxcsn ));
-#endif
+			strcpy( cbuf, maxcsn.bv_val );
 			sid = slap_parse_csn_sid( &maxcsn );
 			for ( i=0; i<si->si_numcsns; i++ ) {
 				if ( sid == si->si_sids[i] ) {
@@ -1674,14 +1571,11 @@ syncprov_op_response( Operation *op, Sla
 					sizeof(int));
 				si->si_sids[i] = sid;
 			}
-		} else if ( !foundit ) {
-			/* internal ops that aren't meant to be replicated */
-			ldap_pvt_thread_rdwr_wunlock( &si->si_csn_rwlock );
-			return SLAP_CB_CONTINUE;
 		}
 
 		/* Don't do any processing for consumer contextCSN updates */
-		if ( op->o_dont_replicate ) {
+		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;
 		}
@@ -1694,12 +1588,8 @@ syncprov_op_response( Operation *op, Sla
 			}
 			if ( si->si_chktime &&
 				(op->o_time - si->si_chklast >= si->si_chktime )) {
-				if ( si->si_chklast ) {
-					do_check = 1;
-					si->si_chklast = op->o_time;
-				} else {
-					si->si_chklast = 1;
-				}
+				do_check = 1;
+				si->si_chklast = op->o_time;
 			}
 		}
 		ldap_pvt_thread_rdwr_wunlock( &si->si_csn_rwlock );
@@ -1710,16 +1600,11 @@ syncprov_op_response( Operation *op, Sla
 			ldap_pvt_thread_rdwr_runlock( &si->si_csn_rwlock );
 		}
 
-		/* only update consumer ctx if this is the greatest csn */
-		if ( bvmatch( &maxcsn, &op->o_csn )) {
-			opc->sctxcsn = maxcsn;
-		}
+		opc->sctxcsn.bv_len = maxcsn.bv_len;
+		opc->sctxcsn.bv_val = cbuf;
 
 		/* Handle any persistent searches */
-		ldap_pvt_thread_mutex_lock( &si->si_ops_mutex );
-		have_psearches = ( si->si_ops != NULL );
-		ldap_pvt_thread_mutex_unlock( &si->si_ops_mutex );
-		if ( have_psearches ) {
+		if ( si->si_ops ) {
 			switch(op->o_tag) {
 			case LDAP_REQ_ADD:
 			case LDAP_REQ_MODIFY:
@@ -1776,7 +1661,6 @@ syncprov_op_compare( Operation *op, Slap
 
 		a.a_vals = si->si_ctxcsn;
 		a.a_nvals = a.a_vals;
-		a.a_numvals = si->si_numcsns;
 
 		rs->sr_err = access_allowed( op, &e, op->oq_compare.rs_ava->aa_desc,
 			&op->oq_compare.rs_ava->aa_value, ACL_COMPARE, NULL );
@@ -1795,10 +1679,10 @@ syncprov_op_compare( Operation *op, Slap
 
 		rs->sr_err = LDAP_COMPARE_FALSE;
 
-		if ( attr_valfind( &a,
+		if ( value_find_ex( op->oq_compare.rs_ava->aa_desc,
 			SLAP_MR_ATTRIBUTE_VALUE_NORMALIZED_MATCH |
 				SLAP_MR_ASSERTED_VALUE_NORMALIZED_MATCH,
-				&op->oq_compare.rs_ava->aa_value, NULL, op->o_tmpmemctx ) == 0 )
+				a.a_nvals, &op->oq_compare.rs_ava->aa_value, op->o_tmpmemctx ) == 0 )
 		{
 			rs->sr_err = LDAP_COMPARE_TRUE;
 		}
@@ -1823,19 +1707,12 @@ syncprov_op_mod( Operation *op, SlapRepl
 {
 	slap_overinst		*on = (slap_overinst *)op->o_bd->bd_info;
 	syncprov_info_t		*si = on->on_bi.bi_private;
-	slap_callback *cb;
-	opcookie *opc;
-	int have_psearches, cbsize;
 
-	ldap_pvt_thread_mutex_lock( &si->si_ops_mutex );
-	have_psearches = ( si->si_ops != NULL );
-	ldap_pvt_thread_mutex_unlock( &si->si_ops_mutex );
-
-	cbsize = sizeof(slap_callback) + sizeof(opcookie) +
-		(have_psearches ? sizeof(modinst) : 0 );
-
-	cb = op->o_tmpcalloc(1, cbsize, op->o_tmpmemctx);
-	opc = (opcookie *)(cb+1);
+	slap_callback *cb = op->o_tmpcalloc(1, sizeof(slap_callback)+
+		sizeof(opcookie) +
+		(si->si_ops ? sizeof(modinst) : 0 ),
+		op->o_tmpmemctx);
+	opcookie *opc = (opcookie *)(cb+1);
 	opc->son = on;
 	cb->sc_response = syncprov_op_response;
 	cb->sc_cleanup = syncprov_op_cleanup;
@@ -1846,7 +1723,7 @@ syncprov_op_mod( Operation *op, SlapRepl
 	/* If there are active persistent searches, lock this operation.
 	 * See seqmod.c for the locking logic on its own.
 	 */
-	if ( have_psearches ) {
+	if ( si->si_ops ) {
 		modtarget *mt, mtdummy;
 		modinst *mi;
 
@@ -1865,13 +1742,7 @@ syncprov_op_mod( Operation *op, SlapRepl
 			/* wait for this op to get to head of list */
 			while ( mt->mt_mods != mi ) {
 				ldap_pvt_thread_mutex_unlock( &mt->mt_mutex );
-				/* FIXME: if dynamic config can delete overlays or
-				 * databases we'll have to check for cleanup here.
-				 * Currently it's not an issue because there are
-				 * no dynamic config deletes...
-				 */
-				if ( !ldap_pvt_thread_pool_pausecheck( &connection_pool ))
-					ldap_pvt_thread_yield();
+				ldap_pvt_thread_yield();
 				ldap_pvt_thread_mutex_lock( &mt->mt_mutex );
 
 				/* clean up if the caller is giving up */
@@ -1899,7 +1770,7 @@ syncprov_op_mod( Operation *op, SlapRepl
 		}
 	}
 
-	if (( have_psearches || si->si_logs ) && op->o_tag != LDAP_REQ_ADD )
+	if (( si->si_ops || si->si_logs ) && op->o_tag != LDAP_REQ_ADD )
 		syncprov_matchops( op, opc, 1 );
 
 	return SLAP_CB_CONTINUE;
@@ -1920,9 +1791,7 @@ typedef struct searchstate {
 	BerVarray ss_ctxcsn;
 	int *ss_sids;
 	int ss_numcsns;
-#define	SS_PRESENT	0x01
-#define	SS_CHANGED	0x02
-	int ss_flags;
+	int ss_present;
 } searchstate;
 
 static int
@@ -1939,7 +1808,6 @@ syncprov_search_cleanup( Operation *op,
 typedef struct SyncOperationBuffer {
 	Operation		sob_op;
 	Opheader		sob_hdr;
-	OpExtra			sob_oe;
 	AttributeName	sob_extra;	/* not always present */
 	/* Further data allocated here */
 } SyncOperationBuffer;
@@ -1968,7 +1836,6 @@ syncprov_detach_op( Operation *op, synco
 	sopbuf2 = ch_calloc( 1, size );
 	op2 = &sopbuf2->sob_op;
 	op2->o_hdr = &sopbuf2->sob_hdr;
-	LDAP_SLIST_FIRST(&op2->o_extra) = &sopbuf2->sob_oe;
 
 	/* Copy the fields we care about explicitly, leave the rest alone */
 	*op2->o_hdr = *op->o_hdr;
@@ -1976,9 +1843,7 @@ syncprov_detach_op( Operation *op, synco
 	op2->o_time = op->o_time;
 	op2->o_bd = on->on_info->oi_origdb;
 	op2->o_request = op->o_request;
-	op2->o_managedsait = op->o_managedsait;
-	LDAP_SLIST_FIRST(&op2->o_extra)->oe_key = on;
-	LDAP_SLIST_NEXT(LDAP_SLIST_FIRST(&op2->o_extra), oe_next) = NULL;
+	op2->o_private = on;
 
 	ptr = (char *) sopbuf2 + offsetof( SyncOperationBuffer, sob_extra );
 	if ( i ) {
@@ -2029,10 +1894,12 @@ syncprov_detach_op( Operation *op, synco
 	op2->o_do_not_cache = 1;
 
 	/* Add op2 to conn so abandon will find us */
+	ldap_pvt_thread_mutex_lock( &op->o_conn->c_mutex );
 	op->o_conn->c_n_ops_executing++;
 	op->o_conn->c_n_ops_completed--;
 	LDAP_STAILQ_INSERT_TAIL( &op->o_conn->c_ops, op2, o_next );
 	so->s_flags |= PS_IS_DETACHED;
+	ldap_pvt_thread_mutex_unlock( &op->o_conn->c_mutex );
 
 	/* Prevent anyone else from trying to send a result for this op */
 	op->o_abandon = 1;
@@ -2043,7 +1910,6 @@ syncprov_search_response( Operation *op,
 {
 	searchstate *ss = op->o_callback->sc_private;
 	slap_overinst *on = ss->ss_on;
-	syncprov_info_t *si = (syncprov_info_t *)on->on_bi.bi_private;
 	sync_control *srs = op->o_controls[slap_cids.sc_LDAPsync];
 
 	if ( rs->sr_type == REP_SEARCH || rs->sr_type == REP_SEARCHREF ) {
@@ -2073,20 +1939,16 @@ syncprov_search_response( Operation *op,
 					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 */
-				for ( i=0; i<ss->ss_numcsns; i++ ) {
-					if ( sid == ss->ss_sids[i] && ber_bvcmp( &a->a_nvals[0],
-						&ss->ss_ctxcsn[i] ) > 0 ) {
-						Debug( LDAP_DEBUG_SYNC,
-							"Entry %s CSN %s greater than snapshot %s\n",
-							rs->sr_entry->e_name.bv_val,
-							a->a_nvals[0].bv_val,
-							ss->ss_ctxcsn[i].bv_val );
-						return LDAP_SUCCESS;
-					}
+			/* Make sure entry is less than the snapshot'd contextCSN */
+			for ( i=0; i<ss->ss_numcsns; i++ ) {
+				if ( sid == ss->ss_sids[i] && ber_bvcmp( &a->a_nvals[0],
+					&ss->ss_ctxcsn[i] ) > 0 ) {
+					Debug( LDAP_DEBUG_SYNC,
+						"Entry %s CSN %s greater than snapshot %s\n",
+						rs->sr_entry->e_name.bv_val,
+						a->a_nvals[0].bv_val,
+						ss->ss_ctxcsn[i].bv_val );
+					return LDAP_SUCCESS;
 				}
 			}
 
@@ -2109,69 +1971,42 @@ syncprov_search_response( Operation *op,
 		rs->sr_ctrls = op->o_tmpalloc( sizeof(LDAPControl *)*2,
 			op->o_tmpmemctx );
 		rs->sr_ctrls[1] = NULL;
-		/* If we're in delta-sync mode, always send a cookie */
-		if ( si->si_nopres && si->si_usehint && a ) {
-			struct berval cookie;
-			slap_compose_sync_cookie( op, &cookie, a->a_nvals, srs->sr_state.rid, srs->sr_state.sid );
-			rs->sr_err = syncprov_state_ctrl( op, rs, rs->sr_entry,
-				LDAP_SYNC_ADD, rs->sr_ctrls, 0, 1, &cookie );
-		} else {
-			rs->sr_err = syncprov_state_ctrl( op, rs, rs->sr_entry,
-				LDAP_SYNC_ADD, rs->sr_ctrls, 0, 0, NULL );
-		}
+		rs->sr_err = syncprov_state_ctrl( op, rs, rs->sr_entry,
+			LDAP_SYNC_ADD, rs->sr_ctrls, 0, 0, NULL );
 	} else if ( rs->sr_type == REP_RESULT && rs->sr_err == LDAP_SUCCESS ) {
 		struct berval cookie;
 
-		if ( ss->ss_flags & SS_CHANGED ) {
-			slap_compose_sync_cookie( op, &cookie, ss->ss_ctxcsn,
-				srs->sr_state.rid, srs->sr_state.sid );
+		slap_compose_sync_cookie( op, &cookie, ss->ss_ctxcsn,
+			srs->sr_state.rid, srs->sr_state.sid );
 
-			Debug( LDAP_DEBUG_SYNC, "syncprov_search_response: cookie=%s\n", cookie.bv_val, 0, 0 );
-		}
-
-		/* Is this a regular refresh?
-		 * Note: refresh never gets here if there were no changes
-		 */
+		/* Is this a regular refresh? */
 		if ( !ss->ss_so ) {
 			rs->sr_ctrls = op->o_tmpalloc( sizeof(LDAPControl *)*2,
 				op->o_tmpmemctx );
 			rs->sr_ctrls[1] = NULL;
 			rs->sr_err = syncprov_done_ctrl( op, rs, rs->sr_ctrls,
-				0, 1, &cookie, ( ss->ss_flags & SS_PRESENT ) ?  LDAP_SYNC_REFRESH_PRESENTS :
+				0, 1, &cookie, ss->ss_present ?  LDAP_SYNC_REFRESH_PRESENTS :
 					LDAP_SYNC_REFRESH_DELETES );
 			op->o_tmpfree( cookie.bv_val, op->o_tmpmemctx );
 		} else {
 		/* It's RefreshAndPersist, transition to Persist phase */
-			syncprov_sendinfo( op, rs, ( ss->ss_flags & SS_PRESENT ) ?
+			syncprov_sendinfo( op, rs, ss->ss_present ?
 	 			LDAP_TAG_SYNC_REFRESH_PRESENT : LDAP_TAG_SYNC_REFRESH_DELETE,
-				( ss->ss_flags & SS_CHANGED ) ? &cookie : NULL,
-				1, NULL, 0 );
-			if ( ss->ss_flags & SS_CHANGED )
-				op->o_tmpfree( cookie.bv_val, op->o_tmpmemctx );
+				&cookie, 1, NULL, 0 );
+			op->o_tmpfree( cookie.bv_val, op->o_tmpmemctx );
 
 			/* Detach this Op from frontend control */
-			ldap_pvt_thread_mutex_lock( &op->o_conn->c_mutex );
+			ldap_pvt_thread_mutex_lock( &ss->ss_so->s_mutex );
 
-			/* But not if this connection was closed along the way */
-			if ( op->o_abandon ) {
-				ldap_pvt_thread_mutex_unlock( &op->o_conn->c_mutex );
-				/* syncprov_ab_cleanup will free this syncop */
-				return SLAPD_ABANDON;
+			/* Turn off the refreshing flag */
+			ss->ss_so->s_flags ^= PS_IS_REFRESHING;
 
-			} else {
-				ldap_pvt_thread_mutex_lock( &ss->ss_so->s_mutex );
-				/* Turn off the refreshing flag */
-				ss->ss_so->s_flags ^= PS_IS_REFRESHING;
-
-				syncprov_detach_op( op, ss->ss_so, on );
-
-				ldap_pvt_thread_mutex_unlock( &op->o_conn->c_mutex );
-
-				/* If there are queued responses, fire them off */
-				if ( ss->ss_so->s_res )
-					syncprov_qstart( ss->ss_so );
-				ldap_pvt_thread_mutex_unlock( &ss->ss_so->s_mutex );
-			}
+			syncprov_detach_op( op, ss->ss_so, on );
+
+			/* If there are queued responses, fire them off */
+			if ( ss->ss_so->s_res )
+				syncprov_qstart( ss->ss_so );
+			ldap_pvt_thread_mutex_unlock( &ss->ss_so->s_mutex );
 
 			return LDAP_SUCCESS;
 		}
@@ -2186,7 +2021,7 @@ syncprov_op_search( Operation *op, SlapR
 	slap_overinst		*on = (slap_overinst *)op->o_bd->bd_info;
 	syncprov_info_t		*si = (syncprov_info_t *)on->on_bi.bi_private;
 	slap_callback	*cb;
-	int gotstate = 0, changed = 0, do_present = 0;
+	int gotstate = 0, nochange = 0, do_present;
 	syncops *sop = NULL;
 	searchstate *ss;
 	sync_control *srs;
@@ -2201,7 +2036,10 @@ syncprov_op_search( Operation *op, SlapR
 		return rs->sr_err;
 	}
 
+	do_present = si->si_nopres ? 0 : 1;
+
 	srs = op->o_controls[slap_cids.sc_LDAPsync];
+	op->o_managedsait = SLAP_CONTROL_NONCRITICAL;
 
 	/* If this is a persistent search, set it up right away */
 	if ( op->o_sync_mode & SLAP_SYNC_PERSIST ) {
@@ -2267,9 +2105,6 @@ syncprov_op_search( Operation *op, SlapR
 		if ( !numcsns )
 			goto no_change;
 
-		if ( !si->si_nopres )
-			do_present = SS_PRESENT;
-
 		/* If there are SIDs we don't recognize in the cookie, drop them */
 		for (i=0; i<srs->sr_state.numcsns; ) {
 			for (j=0; j<numcsns; j++) {
@@ -2300,21 +2135,21 @@ syncprov_op_search( Operation *op, SlapR
 
 		/* If nothing has changed, shortcut it */
 		if ( srs->sr_state.numcsns == numcsns ) {
-			int i, j;
+			int i, j, changed = 0;
 			for ( i=0; i<srs->sr_state.numcsns; i++ ) {
 				for ( j=0; j<numcsns; j++ ) {
 					if ( srs->sr_state.sids[i] != sids[j] )
 						continue;
 					if ( !bvmatch( &srs->sr_state.ctxcsn[i], &ctxcsn[j] ))
-						changed = SS_CHANGED;
+						changed = 1;
 					break;
 				}
 				if ( changed )
 					break;
 			}
 			if ( !changed ) {
-				do_present = 0;
-no_change:		if ( !(op->o_sync_mode & SLAP_SYNC_PERSIST) ) {
+no_change:		nochange = 1;
+				if ( !(op->o_sync_mode & SLAP_SYNC_PERSIST) ) {
 					LDAPControl	*ctrls[2];
 
 					ctrls[0] = NULL;
@@ -2329,9 +2164,6 @@ no_change:		if ( !(op->o_sync_mode & SLA
 				}
 				goto shortcut;
 			}
-		} else {
-			/* consumer doesn't have the right number of CSNs */
-			changed = SS_CHANGED;
 		}
 		/* Do we have a sessionlog for this search? */
 		sl=si->si_logs;
@@ -2355,20 +2187,9 @@ no_change:		if ( !(op->o_sync_mode & SLA
 			if ( si->si_usehint && srs->sr_rhint == 0 ) {
 				if ( ctxcsn )
 					ber_bvarray_free_x( ctxcsn, op->o_tmpmemctx );
-				if ( sids )
-					op->o_tmpfree( sids, op->o_tmpmemctx );
 				send_ldap_error( op, rs, LDAP_SYNC_REFRESH_REQUIRED, "sync cookie is stale" );
 				return rs->sr_err;
 			}
-			if ( srs->sr_state.ctxcsn ) {
-				ber_bvarray_free_x( srs->sr_state.ctxcsn, op->o_tmpmemctx );
-				srs->sr_state.ctxcsn = NULL;
-			}
-			if ( srs->sr_state.sids ) {
-				slap_sl_free( srs->sr_state.sids, op->o_tmpmemctx );
-				srs->sr_state.sids = NULL;
-			}
-			srs->sr_state.numcsns = 0;
 		} else {
 			gotstate = 1;
 			/* If changed and doing Present lookup, send Present UUIDs */
@@ -2376,15 +2197,10 @@ no_change:		if ( !(op->o_sync_mode & SLA
 				LDAP_SUCCESS ) {
 				if ( ctxcsn )
 					ber_bvarray_free_x( ctxcsn, op->o_tmpmemctx );
-				if ( sids )
-					op->o_tmpfree( sids, op->o_tmpmemctx );
 				send_ldap_result( op, rs );
 				return rs->sr_err;
 			}
 		}
-	} else {
-		/* No consumer state, assume something has changed */
-		changed = SS_CHANGED;
 	}
 
 shortcut:
@@ -2396,7 +2212,7 @@ shortcut:
 	}
 
 	/* If something changed, find the changes */
-	if ( gotstate && changed ) {
+	if ( gotstate && !nochange ) {
 		Filter *fand, *fava;
 
 		fand = op->o_tmpalloc( sizeof(Filter), op->o_tmpmemctx );
@@ -2423,7 +2239,7 @@ shortcut:
 	ss = (searchstate *)(cb+1);
 	ss->ss_on = on;
 	ss->ss_so = sop;
-	ss->ss_flags = do_present | changed;
+	ss->ss_present = do_present;
 	ss->ss_ctxcsn = ctxcsn;
 	ss->ss_numcsns = numcsns;
 	ss->ss_sids = sids;
@@ -2437,7 +2253,7 @@ shortcut:
 	 * the refresh phase, just invoke the response callback to transition
 	 * us into persist phase
 	 */
-	if ( !changed ) {
+	if ( nochange ) {
 		rs->sr_err = LDAP_SUCCESS;
 		rs->sr_nentries = 0;
 		send_ldap_result( op, rs );
@@ -2454,12 +2270,6 @@ syncprov_operational(
 	slap_overinst		*on = (slap_overinst *)op->o_bd->bd_info;
 	syncprov_info_t		*si = (syncprov_info_t *)on->on_bi.bi_private;
 
-	/* This prevents generating unnecessarily; frontend will strip
-	 * any statically stored copy.
-	 */
-	if ( op->o_sync != SLAP_CONTROL_NONE )
-		return SLAP_CB_CONTINUE;
-
 	if ( rs->sr_entry &&
 		dn_match( &rs->sr_entry->e_nname, op->o_bd->be_nsuffix )) {
 
@@ -2483,15 +2293,8 @@ syncprov_operational(
 				}
 
 				if ( !ap ) {
-					if ( !(rs->sr_flags & REP_ENTRY_MODIFIABLE) ) {
-						Entry *e = entry_dup( rs->sr_entry );
-						if ( rs->sr_flags & REP_ENTRY_MUSTRELEASE ) {
-							overlay_entry_release_ov( op, rs->sr_entry, 0, on );
-							rs->sr_flags ^= REP_ENTRY_MUSTRELEASE;
-						} else if ( rs->sr_flags & REP_ENTRY_MUSTBEFREED ) {
-							entry_free( rs->sr_entry );
-						}
-						rs->sr_entry = e;
+					if ( !rs->sr_flags & REP_ENTRY_MODIFIABLE ) {
+						rs->sr_entry = entry_dup( rs->sr_entry );
 						rs->sr_flags |=
 							REP_ENTRY_MODIFIABLE|REP_ENTRY_MUSTBEFREED;
 						a = attr_find( rs->sr_entry->e_attrs,
@@ -2547,11 +2350,7 @@ static ConfigOCs spocs[] = {
 		"NAME 'olcSyncProvConfig' "
 		"DESC 'SyncRepl Provider configuration' "
 		"SUP olcOverlayConfig "
-		"MAY ( olcSpCheckpoint "
-			"$ olcSpSessionlog "
-			"$ olcSpNoPresent "
-			"$ olcSpReloadHint "
-		") )",
+		"MAY ( olcSpCheckpoint $ olcSpSessionlog $ olcSpNoPresent ) )",
 			Cft_Overlay, spcfg },
 	{ NULL, 0, NULL }
 };
@@ -2568,14 +2367,10 @@ sp_cf_gen(ConfigArgs *c)
 		case SP_CHKPT:
 			if ( si->si_chkops || si->si_chktime ) {
 				struct berval bv;
-				bv.bv_len = snprintf( c->cr_msg, sizeof( c->cr_msg ),
-					"%d %d", si->si_chkops, si->si_chktime );
-				if ( bv.bv_len >= sizeof( c->cr_msg ) ) {
-					rc = 1;
-				} else {
-					bv.bv_val = c->cr_msg;
-					value_add_one( &c->rvalue_vals, &bv );
-				}
+				bv.bv_len = sprintf( c->cr_msg, "%d %d",
+					si->si_chkops, si->si_chktime );
+				bv.bv_val = c->cr_msg;
+				value_add_one( &c->rvalue_vals, &bv );
 			} else {
 				rc = 1;
 			}
@@ -2764,7 +2559,7 @@ syncprov_db_open(
 			si->si_sids = slap_parse_csn_sids( si->si_ctxcsn, a->a_numvals, NULL );
 		}
 		overlay_entry_release_ov( op, e, 0, on );
-		if ( si->si_ctxcsn && !SLAP_DBCLEAN( be )) {
+		if ( si->si_ctxcsn ) {
 			op->o_req_dn = be->be_suffix[0];
 			op->o_req_ndn = be->be_nsuffix[0];
 			op->ors_scope = LDAP_SCOPE_SUBTREE;
@@ -2990,14 +2785,10 @@ static int syncprov_parseCtrl (
 	sr->sr_rhint = rhint;
 	if (!BER_BVISNULL(&cookie)) {
 		ber_dupbv_x( &sr->sr_state.octet_str, &cookie, op->o_tmpmemctx );
-		/* If parse fails, pretend no cookie was sent */
 		if ( slap_parse_sync_cookie( &sr->sr_state, op->o_tmpmemctx ) ||
 			sr->sr_state.rid == -1 ) {
-			if ( sr->sr_state.ctxcsn ) {
-				ber_bvarray_free_x( sr->sr_state.ctxcsn, op->o_tmpmemctx );
-				sr->sr_state.ctxcsn = NULL;
-			}
-			sr->sr_state.numcsns = 0;
+			rs->sr_text = "Sync control : cookie parsing error";
+			return LDAP_PROTOCOL_ERROR;
 		}
 	}