--- servers/slapd/overlays/syncprov.c	2007/06/08 07:08:39	1.56.2.43
+++ servers/slapd/overlays/syncprov.c	2005/10/02 08:48:28	1.109
@@ -1,8 +1,8 @@
-/* $OpenLDAP$ */
+/* $OpenLDAP: pkg/ldap/servers/slapd/overlays/syncprov.c,v 1.108 2005/10/02 03:01:45 hyc Exp $ */
 /* syncprov.c - syncrepl provider */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 2004-2007 The OpenLDAP Foundation.
+ * Copyright 2004-2005 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -65,13 +65,11 @@ typedef struct syncops {
 #define	PS_IS_DETACHED		0x02
 #define	PS_WROTE_BASE		0x04
 #define	PS_FIND_BASE		0x08
-#define	PS_FIX_FILTER		0x10
 
 	int		s_inuse;	/* reference count */
 	struct syncres *s_res;
 	struct syncres *s_restail;
-	struct re_s	*s_qtask;	/* task for playing psearch responses */
-#define	RUNQ_INTERVAL	36000	/* a long time */
+	void	*s_qtask;	/* task for playing psearch responses */
 	ldap_pvt_thread_mutex_t	s_mutex;
 } syncops;
 
@@ -123,11 +121,10 @@ typedef struct syncprov_info_t {
 	int		si_chktime;
 	int		si_numops;	/* number of ops since last checkpoint */
 	int		si_nopres;	/* Skip present phase */
-	int		si_usehint;	/* use reload hint */
 	time_t	si_chklast;	/* time of last checkpoint */
 	Avlnode	*si_mods;	/* entries being modified */
 	sessionlog	*si_logs;
-	ldap_pvt_thread_rdwr_t	si_csn_rwlock;
+	ldap_pvt_thread_mutex_t	si_csn_mutex;
 	ldap_pvt_thread_mutex_t	si_ops_mutex;
 	ldap_pvt_thread_mutex_t	si_mods_mutex;
 	char		si_ctxcsnbuf[LDAP_LUTIL_CSNSTR_BUFSIZE];
@@ -384,9 +381,6 @@ findbase_cb( Operation *op, SlapReply *r
 	return LDAP_SUCCESS;
 }
 
-static Filter generic_filter = { LDAP_FILTER_PRESENT, { 0 }, NULL };
-static struct berval generic_filterstr = BER_BVC("(objectclass=*)");
-
 static int
 syncprov_findbase( Operation *op, fbase_cookie *fc )
 {
@@ -426,8 +420,6 @@ syncprov_findbase( Operation *op, fbase_
 		fop.ors_tlimit = SLAP_NO_LIMIT;
 		fop.ors_attrs = slap_anlist_no_attrs;
 		fop.ors_attrsonly = 1;
-		fop.ors_filter = &generic_filter;
-		fop.ors_filterstr = generic_filterstr;
 
 		fop.o_bd->bd_info = on->on_info->oi_orig;
 		rc = fop.o_bd->be_search( &fop, &frs );
@@ -451,10 +443,12 @@ syncprov_findbase( Operation *op, fbase_
 		case LDAP_SCOPE_SUBTREE:
 			fc->fscope = dnIsSuffix( fc->fdn, &fc->fss->s_base );
 			break;
+#ifdef LDAP_SCOPE_SUBORDINATE
 		case LDAP_SCOPE_SUBORDINATE:
 			fc->fscope = dnIsSuffix( fc->fdn, &fc->fss->s_base ) &&
 				!dn_match( fc->fdn, &fc->fss->s_base );
 			break;
+#endif
 		}
 	}
 
@@ -482,11 +476,9 @@ syncprov_findbase( Operation *op, fbase_
  * CSN, and generate Present records for them. We always collect this result
  * in SyncID sets, even if there's only one match.
  */
-typedef enum find_csn_t {
-	FIND_MAXCSN	= 1,
-	FIND_CSN	= 2,
-	FIND_PRESENT	= 3
-} find_csn_t;
+#define	FIND_MAXCSN	1
+#define	FIND_CSN	2
+#define	FIND_PRESENT	3
 
 static int
 findmax_cb( Operation *op, SlapReply *rs )
@@ -509,11 +501,7 @@ findcsn_cb( Operation *op, SlapReply *rs
 {
 	slap_callback *sc = op->o_callback;
 
-	/* We just want to know that at least one exists, so it's OK if
-	 * we exceed the unchecked limit.
-	 */
-	if ( rs->sr_err == LDAP_ADMINLIMIT_EXCEEDED ||
-		(rs->sr_type == REP_SEARCH && rs->sr_err == LDAP_SUCCESS )) {
+	if ( rs->sr_type == REP_SEARCH && rs->sr_err == LDAP_SUCCESS ) {
 		sc->sc_private = (void *)1;
 	}
 	return LDAP_SUCCESS;
@@ -569,7 +557,7 @@ findpres_cb( Operation *op, SlapReply *r
 }
 
 static int
-syncprov_findcsn( Operation *op, find_csn_t mode )
+syncprov_findcsn( Operation *op, int mode )
 {
 	slap_overinst		*on = (slap_overinst *)op->o_bd->bd_info;
 	syncprov_info_t		*si = on->on_bi.bi_private;
@@ -580,16 +568,16 @@ syncprov_findcsn( Operation *op, find_cs
 	char buf[LDAP_LUTIL_CSNSTR_BUFSIZE + STRLENOF("(entryCSN<=)")];
 	char cbuf[LDAP_LUTIL_CSNSTR_BUFSIZE];
 	struct berval maxcsn;
-	Filter cf;
+	Filter cf, af;
 #ifdef LDAP_COMP_MATCH
 	AttributeAssertion eq = { NULL, BER_BVNULL, NULL };
 #else
 	AttributeAssertion eq = { NULL, BER_BVNULL };
 #endif
+	int i, rc = LDAP_SUCCESS;
 	fpres_cookie pcookie;
 	sync_control *srs = NULL;
-	struct slap_limits_set fc_limits;
-	int i, rc = LDAP_SUCCESS, findcsn_retry = 1;
+	int findcsn_retry = 1;
 
 	if ( mode != FIND_MAXCSN ) {
 		srs = op->o_controls[slap_cids.sc_LDAPsync];
@@ -640,8 +628,6 @@ again:
 		/* On retry, look for <= */
 		} else {
 			cf.f_choice = LDAP_FILTER_LE;
-			fop.ors_limit = &fc_limits;
-			fc_limits.lms_s_unchecked = 1;
 			fop.ors_filterstr.bv_len = sprintf( buf, "(entryCSN<=%s)",
 				cf.f_av_value.bv_val );
 		}
@@ -652,8 +638,14 @@ again:
 		cb.sc_response = findcsn_cb;
 		break;
 	case FIND_PRESENT:
-		fop.ors_filter = op->ors_filter;
-		fop.ors_filterstr = op->ors_filterstr;
+		af.f_choice = LDAP_FILTER_AND;
+		af.f_next = NULL;
+		af.f_and = &cf;
+		cf.f_choice = LDAP_FILTER_LE;
+		cf.f_av_value = srs->sr_state.ctxcsn;
+		cf.f_next = op->ors_filter;
+		fop.ors_filter = &af;
+		filter2bv_x( &fop, fop.ors_filter, &fop.ors_filterstr );
 		fop.ors_attrsonly = 0;
 		fop.ors_attrs = uuid_anlist;
 		fop.ors_slimit = SLAP_NO_LIMIT;
@@ -697,45 +689,16 @@ again:
 		break;
 	case FIND_PRESENT:
 		op->o_tmpfree( pcookie.uuids, op->o_tmpmemctx );
+		op->o_tmpfree( fop.ors_filterstr.bv_val, op->o_tmpmemctx );
 		break;
 	}
 
 	return rc;
 }
 
-static void
-syncprov_free_syncop( syncops *so )
-{
-	syncres *sr, *srnext;
-	GroupAssertion *ga, *gnext;
-
-	ldap_pvt_thread_mutex_lock( &so->s_mutex );
-	if ( --so->s_inuse > 0 ) {
-		ldap_pvt_thread_mutex_unlock( &so->s_mutex );
-		return;
-	}
-	ldap_pvt_thread_mutex_unlock( &so->s_mutex );
-	if ( so->s_flags & PS_IS_DETACHED ) {
-		filter_free( so->s_op->ors_filter );
-		for ( ga = so->s_op->o_groups; ga; ga=gnext ) {
-			gnext = ga->ga_next;
-			ch_free( ga );
-		}
-		ch_free( so->s_op );
-	}
-	ch_free( so->s_base.bv_val );
-	for ( sr=so->s_res; sr; sr=srnext ) {
-		srnext = sr->s_next;
-		ch_free( sr );
-	}
-	ldap_pvt_thread_mutex_destroy( &so->s_mutex );
-	ch_free( so );
-}
-
 /* Send a persistent search response */
 static int
-syncprov_sendresp( Operation *op, opcookie *opc, syncops *so,
-	Entry **e, int mode )
+syncprov_sendresp( Operation *op, opcookie *opc, syncops *so, Entry **e, int mode)
 {
 	slap_overinst *on = opc->son;
 
@@ -756,7 +719,6 @@ syncprov_sendresp( Operation *op, opcook
 	a_uuid.a_nvals = &opc->suuid;
 	rs.sr_err = syncprov_state_ctrl( op, &rs, &e_uuid,
 		mode, ctrls, 0, 1, &cookie );
-	op->o_tmpfree( cookie.bv_val, op->o_tmpmemctx );
 
 	rs.sr_ctrls = ctrls;
 	op->o_bd->bd_info = (BackendInfo *)on->on_info;
@@ -767,7 +729,7 @@ syncprov_sendresp( Operation *op, opcook
 			rs.sr_flags = REP_ENTRY_MUSTRELEASE;
 		if ( opc->sreference ) {
 			rs.sr_ref = get_entry_referrals( op, rs.sr_entry );
-			rs.sr_err = send_search_reference( op, &rs );
+			send_search_reference( op, &rs );
 			ber_bvarray_free( rs.sr_ref );
 			if ( !rs.sr_entry )
 				*e = NULL;
@@ -779,7 +741,7 @@ syncprov_sendresp( Operation *op, opcook
 		if ( rs.sr_entry->e_private )
 			rs.sr_flags = REP_ENTRY_MUSTRELEASE;
 		rs.sr_attrs = op->ors_attrs;
-		rs.sr_err = send_search_entry( op, &rs );
+		send_search_entry( op, &rs );
 		if ( !rs.sr_entry )
 			*e = NULL;
 		break;
@@ -791,19 +753,16 @@ syncprov_sendresp( Operation *op, opcook
 		if ( opc->sreference ) {
 			struct berval bv = BER_BVNULL;
 			rs.sr_ref = &bv;
-			rs.sr_err = send_search_reference( op, &rs );
+			send_search_reference( op, &rs );
 		} else {
-			rs.sr_err = send_search_entry( op, &rs );
+			send_search_entry( op, &rs );
 		}
 		break;
 	default:
 		assert(0);
 	}
-	/* In case someone else freed it already? */
-	if ( rs.sr_ctrls ) {
-		op->o_tmpfree( rs.sr_ctrls[0], op->o_tmpmemctx );
-		rs.sr_ctrls = NULL;
-	}
+	op->o_tmpfree( rs.sr_ctrls[0], op->o_tmpmemctx );
+	rs.sr_ctrls = NULL;
 
 	return rs.sr_err;
 }
@@ -815,7 +774,7 @@ syncprov_qplay( Operation *op, slap_over
 	syncres *sr;
 	Entry *e;
 	opcookie opc;
-	int rc = 0;
+	int rc;
 
 	opc.son = on;
 	op->o_bd->bd_info = (BackendInfo *)on->on_info;
@@ -829,36 +788,34 @@ syncprov_qplay( Operation *op, slap_over
 			so->s_restail = NULL;
 		ldap_pvt_thread_mutex_unlock( &so->s_mutex );
 
-		if ( !sr || so->s_op->o_abandon )
+		if ( !sr )
 			break;
 
-		opc.sdn = sr->s_dn;
-		opc.sndn = sr->s_ndn;
-		opc.suuid = sr->s_uuid;
-		opc.sctxcsn = sr->s_csn;
-		opc.sreference = sr->s_isreference;
-		e = NULL;
-
-		if ( sr->s_mode != LDAP_SYNC_DELETE ) {
-			rc = be_entry_get_rw( op, &opc.sndn, NULL, NULL, 0, &e );
-			if ( rc ) {
-				Debug( LDAP_DEBUG_SYNC, "syncprov_qplay: failed to get %s, "
-					"error (%d), ignoring...\n", opc.sndn.bv_val, rc, 0 );
-				ch_free( sr );
-				rc = 0;
-				continue;
+		if ( !so->s_op->o_abandon ) {
+			opc.sdn = sr->s_dn;
+			opc.sndn = sr->s_ndn;
+			opc.suuid = sr->s_uuid;
+			opc.sctxcsn = sr->s_csn;
+			opc.sreference = sr->s_isreference;
+			e = NULL;
+
+			if ( sr->s_mode != LDAP_SYNC_DELETE ) {
+				rc = be_entry_get_rw( op, &opc.sndn, NULL, NULL, 0, &e );
+				if ( rc ) {
+					ch_free( sr );
+					continue;
+				}
 			}
-		}
-		rc = syncprov_sendresp( op, &opc, so, &e, sr->s_mode );
+			rc = syncprov_sendresp( op, &opc, so, &e, sr->s_mode );
 
-		if ( e ) {
-			be_entry_release_rw( op, e, 0 );
+			if ( e ) {
+				be_entry_release_rw( op, e, 0 );
+			}
+			if ( rc )
+				break;
 		}
 
 		ch_free( sr );
-
-		if ( rc )
-			break;
 	}
 	op->o_bd->bd_info = (BackendInfo *)on;
 	return rc;
@@ -871,16 +828,14 @@ 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;
+	char opbuf[OPERATION_BUFFER_SIZE];
 	Operation *op;
 	BackendDB be;
-	int rc;
 
-	op = (Operation *) &opbuf;
-	*op = *so->s_op;
+	op = (Operation *)opbuf;
+	memset( op, 0, sizeof(opbuf));
 	op->o_hdr = (Opheader *)(op+1);
 	op->o_controls = (void **)(op->o_hdr+1);
-	memset( op->o_controls, 0, SLAP_MAX_CIDS * sizeof(void *));
 
 	*op->o_hdr = *so->s_op->o_hdr;
 
@@ -895,52 +850,17 @@ syncprov_qtask( void *ctx, void *arg )
 	op->o_private = NULL;
 	op->o_callback = NULL;
 
-	rc = syncprov_qplay( op, on, so );
-
-	/* decrement use count... */
-	syncprov_free_syncop( so );
+	syncprov_qplay( op, on, 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_runqueue_stoptask( &slapd_rq, so->s_qtask );
+	ldap_pvt_runqueue_resched( &slapd_rq, so->s_qtask, 1 );
 	ldap_pvt_thread_mutex_unlock( &slapd_rq.rq_mutex );
 
 	return NULL;
 }
 
-/* Start the task to play back queued psearch responses */
-static void
-syncprov_qstart( syncops *so )
-{
-	int wake=0;
-	ldap_pvt_thread_mutex_lock( &slapd_rq.rq_mutex );
-	if ( !so->s_qtask ) {
-		so->s_qtask = ldap_pvt_runqueue_insert( &slapd_rq, RUNQ_INTERVAL,
-			syncprov_qtask, so, "syncprov_qtask",
-			so->s_op->o_conn->c_peer_name.bv_val );
-		++so->s_inuse;
-		wake = 1;
-	} else {
-		if (!ldap_pvt_runqueue_isrunning( &slapd_rq, so->s_qtask ) &&
-			!so->s_qtask->next_sched.tv_sec ) {
-			so->s_qtask->interval.tv_sec = 0;
-			ldap_pvt_runqueue_resched( &slapd_rq, so->s_qtask, 0 );
-			so->s_qtask->interval.tv_sec = RUNQ_INTERVAL;
-			++so->s_inuse;
-			wake = 1;
-		}
-	}
-	ldap_pvt_thread_mutex_unlock( &slapd_rq.rq_mutex );
-	if ( wake )
-		slap_wake_listener();
-}
-
 /* Queue a persistent search response */
 static int
 syncprov_qresp( opcookie *opc, syncops *so, int mode )
@@ -954,14 +874,13 @@ syncprov_qresp( opcookie *opc, syncops *
 	sr->s_dn.bv_len = opc->sdn.bv_len;
 	sr->s_mode = mode;
 	sr->s_isreference = opc->sreference;
-	sr->s_ndn.bv_val = lutil_strcopy( sr->s_dn.bv_val,
-		 opc->sdn.bv_val ) + 1;
+	sr->s_ndn.bv_val = lutil_strcopy( sr->s_dn.bv_val, opc->sdn.bv_val );
 	sr->s_ndn.bv_len = opc->sndn.bv_len;
-	sr->s_uuid.bv_val = lutil_strcopy( sr->s_ndn.bv_val,
-		 opc->sndn.bv_val ) + 1;
+	*(sr->s_ndn.bv_val++) = '\0';
+	sr->s_uuid.bv_val = lutil_strcopy( sr->s_ndn.bv_val, opc->sndn.bv_val );
 	sr->s_uuid.bv_len = opc->suuid.bv_len;
-	AC_MEMCPY( sr->s_uuid.bv_val, opc->suuid.bv_val, opc->suuid.bv_len );
-	sr->s_csn.bv_val = sr->s_uuid.bv_val + sr->s_uuid.bv_len + 1;
+	*(sr->s_uuid.bv_val++) = '\0';
+	sr->s_csn.bv_val = lutil_strcopy( sr->s_uuid.bv_val, opc->suuid.bv_val );
 	sr->s_csn.bv_len = opc->sctxcsn.bv_len;
 	strcpy( sr->s_csn.bv_val, opc->sctxcsn.bv_val );
 
@@ -979,12 +898,52 @@ syncprov_qresp( opcookie *opc, syncops *
 		so->s_flags |= PS_FIND_BASE;
 	}
 	if ( so->s_flags & PS_IS_DETACHED ) {
-		syncprov_qstart( so );
+		ldap_pvt_thread_mutex_lock( &slapd_rq.rq_mutex );
+		if ( !so->s_qtask ) {
+			so->s_qtask = ldap_pvt_runqueue_insert( &slapd_rq, 0,
+				syncprov_qtask, so, "syncprov_qtask",
+				so->s_op->o_conn->c_peer_name.bv_val );
+		} else {
+			if (!ldap_pvt_runqueue_isrunning( &slapd_rq, so->s_qtask )) {
+				ldap_pvt_runqueue_resched( &slapd_rq, so->s_qtask, 0 );
+			}
+		}
+		ldap_pvt_thread_mutex_unlock( &slapd_rq.rq_mutex );
 	}
 	ldap_pvt_thread_mutex_unlock( &so->s_mutex );
 	return LDAP_SUCCESS;
 }
 
+static void
+syncprov_free_syncop( syncops *so )
+{
+	syncres *sr, *srnext;
+	GroupAssertion *ga, *gnext;
+
+	ldap_pvt_thread_mutex_lock( &so->s_mutex );
+	so->s_inuse--;
+	if ( so->s_inuse > 0 ) {
+		ldap_pvt_thread_mutex_unlock( &so->s_mutex );
+		return;
+	}
+	ldap_pvt_thread_mutex_unlock( &so->s_mutex );
+	if ( so->s_flags & PS_IS_DETACHED ) {
+		filter_free( so->s_op->ors_filter );
+		for ( ga = so->s_op->o_groups; ga; ga=gnext ) {
+			gnext = ga->ga_next;
+			ch_free( ga );
+		}
+		ch_free( so->s_op );
+	}
+	ch_free( so->s_base.bv_val );
+	for ( sr=so->s_res; sr; sr=srnext ) {
+		srnext = sr->s_next;
+		ch_free( sr );
+	}
+	ldap_pvt_thread_mutex_destroy( &so->s_mutex );
+	ch_free( so );
+}
+
 static int
 syncprov_drop_psearch( syncops *so, int lock )
 {
@@ -1065,7 +1024,6 @@ syncprov_matchops( Operation *op, opcook
 	int rc;
 	struct berval newdn;
 	int freefdn = 0;
-	BackendDB *b0 = op->o_bd, db;
 
 	fc.fdn = &op->o_req_ndn;
 	/* compute new DN */
@@ -1078,10 +1036,6 @@ syncprov_matchops( Operation *op, opcook
 		freefdn = 1;
 	}
 	if ( op->o_tag != LDAP_REQ_ADD ) {
-		if ( !SLAP_ISOVERLAY( op->o_bd )) {
-			db = *op->o_bd;
-			op->o_bd = &db;
-		}
 		op->o_bd->bd_info = (BackendInfo *)on->on_info;
 		rc = be_entry_get_rw( op, fc.fdn, NULL, NULL, 0, &e );
 		/* If we're sending responses now, make a copy and unlock the DB */
@@ -1091,10 +1045,7 @@ syncprov_matchops( Operation *op, opcook
 			e = e2;
 		}
 		op->o_bd->bd_info = (BackendInfo *)on;
-		if ( rc ) {
-			op->o_bd = b0;
-			return;
-		}
+		if ( rc ) return;
 	} else {
 		e = op->ora_e;
 	}
@@ -1168,14 +1119,14 @@ syncprov_matchops( Operation *op, opcook
 				sm = op->o_tmpalloc( sizeof(syncmatches), op->o_tmpmemctx );
 				sm->sm_next = opc->smatches;
 				sm->sm_op = ss;
-				ldap_pvt_thread_mutex_lock( &ss->s_mutex );
-				++ss->s_inuse;
-				ldap_pvt_thread_mutex_unlock( &ss->s_mutex );
+				ss->s_inuse++;
 				opc->smatches = sm;
 			} else {
 				/* if found send UPDATE else send ADD */
+				ss->s_inuse++;
 				syncprov_qresp( opc, ss,
 					found ? LDAP_SYNC_MODIFY : LDAP_SYNC_ADD );
+				ss->s_inuse--;
 			}
 		} else if ( !saveit && found ) {
 			/* send DELETE */
@@ -1192,7 +1143,6 @@ syncprov_matchops( Operation *op, opcook
 	if ( freefdn ) {
 		op->o_tmpfree( fc.fdn->bv_val, op->o_tmpmemctx );
 	}
-	op->o_bd = b0;
 }
 
 static int
@@ -1250,18 +1200,13 @@ syncprov_checkpoint( Operation *op, Slap
 	syncprov_info_t		*si = on->on_bi.bi_private;
 	Modifications mod;
 	Operation opm;
-	SlapReply rsm = { 0 };
 	struct berval bv[2];
 	slap_callback cb = {0};
+	int manage = get_manageDSAit(op);
 
-	/* If ctxcsn is empty, delete it */
-	if ( BER_BVISEMPTY( &si->si_ctxcsn )) {
-		mod.sml_values = NULL;
-	} else {
-		mod.sml_values = bv;
-		bv[1].bv_val = NULL;
-		bv[0] = si->si_ctxcsn;
-	}
+	mod.sml_values = bv;
+	bv[1].bv_val = NULL;
+	bv[0] = si->si_ctxcsn;
 	mod.sml_nvalues = NULL;
 	mod.sml_desc = slap_schema.si_ad_contextCSN;
 	mod.sml_op = LDAP_MOD_REPLACE;
@@ -1277,16 +1222,12 @@ syncprov_checkpoint( Operation *op, Slap
 	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;
-	SLAP_DBFLAGS( opm.o_bd ) |= SLAP_DBFLAG_NOLASTMOD;
-	opm.o_bd->be_modify( &opm, &rsm );
-	SLAP_DBFLAGS( opm.o_bd ) ^= SLAP_DBFLAG_NOLASTMOD;
-	if ( mod.sml_next != NULL ) {
-		slap_mods_free( mod.sml_next, 1 );
-	}
+	opm.o_bd->be_modify( &opm, rs );
+	opm.o_managedsait = manage;
 }
 
 static void
-syncprov_add_slog( Operation *op )
+syncprov_add_slog( Operation *op, struct berval *csn )
 {
 	opcookie *opc = op->o_callback->sc_private;
 	slap_overinst *on = opc->son;
@@ -1298,18 +1239,18 @@ syncprov_add_slog( Operation *op )
 	{
 		/* Allocate a record. UUIDs are not NUL-terminated. */
 		se = ch_malloc( sizeof( slog_entry ) + opc->suuid.bv_len + 
-			op->o_csn.bv_len + 1 );
+			csn->bv_len + 1 );
 		se->se_next = NULL;
 		se->se_tag = op->o_tag;
 
-		se->se_uuid.bv_val = (char *)(&se[1]);
+		se->se_uuid.bv_val = (char *)(se+1);
 		AC_MEMCPY( se->se_uuid.bv_val, opc->suuid.bv_val, opc->suuid.bv_len );
 		se->se_uuid.bv_len = opc->suuid.bv_len;
 
 		se->se_csn.bv_val = se->se_uuid.bv_val + opc->suuid.bv_len;
-		AC_MEMCPY( se->se_csn.bv_val, op->o_csn.bv_val, op->o_csn.bv_len );
-		se->se_csn.bv_val[op->o_csn.bv_len] = '\0';
-		se->se_csn.bv_len = op->o_csn.bv_len;
+		AC_MEMCPY( se->se_csn.bv_val, csn->bv_val, csn->bv_len );
+		se->se_csn.bv_val[csn->bv_len] = '\0';
+		se->se_csn.bv_len = csn->bv_len;
 
 		ldap_pvt_thread_mutex_lock( &sl->sl_mutex );
 		if ( sl->sl_head ) {
@@ -1326,6 +1267,9 @@ syncprov_add_slog( Operation *op )
 			sl->sl_mincsn.bv_len = se->se_csn.bv_len;
 			ch_free( se );
 			sl->sl_num--;
+			if ( !sl->sl_head ) {
+				sl->sl_tail = NULL;
+			}
 		}
 		ldap_pvt_thread_mutex_unlock( &sl->sl_mutex );
 	}
@@ -1344,14 +1288,12 @@ playlog_cb( Operation *op, SlapReply *rs
 /* enter with sl->sl_mutex locked, release before returning */
 static void
 syncprov_playlog( Operation *op, SlapReply *rs, sessionlog *sl,
-	sync_control *srs, struct berval *ctxcsn )
+	struct berval *oldcsn, struct berval *ctxcsn )
 {
 	slap_overinst		*on = (slap_overinst *)op->o_bd->bd_info;
 	slog_entry *se;
 	int i, j, ndel, num, nmods, mmods;
-	char cbuf[LDAP_LUTIL_CSNSTR_BUFSIZE];
 	BerVarray uuids;
-	struct berval delcsn;
 
 	if ( !sl->sl_num ) {
 		ldap_pvt_thread_mutex_unlock( &sl->sl_mutex );
@@ -1364,34 +1306,19 @@ syncprov_playlog( Operation *op, SlapRep
 
 	uuids = op->o_tmpalloc( (num+1) * sizeof( struct berval ) +
 		num * UUID_LEN, op->o_tmpmemctx );
-	uuids[0].bv_val = (char *)(uuids + num + 1);
 
-	delcsn.bv_len = 0;
-	delcsn.bv_val = cbuf;
+	uuids[0].bv_val = (char *)(uuids + num + 1);
 
 	/* Make a copy of the relevant UUIDs. Put the Deletes up front
 	 * and everything else at the end. Do this first so we can
 	 * unlock the list mutex.
 	 */
-	Debug( LDAP_DEBUG_SYNC, "srs csn %s\n", srs->sr_state.ctxcsn.bv_val, 0, 0 );
 	for ( se=sl->sl_head; se; se=se->se_next ) {
-		Debug( LDAP_DEBUG_SYNC, "log csn %s\n", se->se_csn.bv_val, 0, 0 );
-		ndel = ber_bvcmp( &se->se_csn, &srs->sr_state.ctxcsn );
-		if ( ndel <= 0 ) {
-			Debug( LDAP_DEBUG_SYNC, "cmp %d, too old\n", ndel, 0, 0 );
-			continue;
-		}
-		ndel = ber_bvcmp( &se->se_csn, ctxcsn );
-		if ( ndel > 0 ) {
-			Debug( LDAP_DEBUG_SYNC, "cmp %d, too new\n", ndel, 0, 0 );
-			break;
-		}
+		if ( ber_bvcmp( &se->se_csn, oldcsn ) < 0 ) continue;
+		if ( ber_bvcmp( &se->se_csn, ctxcsn ) > 0 ) break;
 		if ( se->se_tag == LDAP_REQ_DELETE ) {
 			j = i;
 			i++;
-			AC_MEMCPY( cbuf, se->se_csn.bv_val, se->se_csn.bv_len );
-			delcsn.bv_len = se->se_csn.bv_len;
-			delcsn.bv_val[delcsn.bv_len] = '\0';
 		} else {
 			nmods++;
 			j = num - nmods;
@@ -1472,7 +1399,6 @@ syncprov_playlog( Operation *op, SlapRep
 			mf.f_av_value = uuids[i];
 			cb.sc_private = NULL;
 			fop.ors_slimit = 1;
-			frs.sr_nentries = 0;
 			rc = fop.o_bd->be_search( &fop, &frs );
 
 			/* If entry was not found, add to delete list */
@@ -1483,14 +1409,9 @@ syncprov_playlog( Operation *op, SlapRep
 		fop.o_bd->bd_info = (BackendInfo *)on;
 	}
 	if ( ndel ) {
-		struct berval cookie;
-
-		slap_compose_sync_cookie( op, &cookie, &delcsn, srs->sr_state.rid );
 		uuids[ndel].bv_val = NULL;
-		syncprov_sendinfo( op, rs, LDAP_TAG_SYNC_ID_SET, &cookie, 0, uuids, 1 );
-		op->o_tmpfree( cookie.bv_val, op->o_tmpmemctx );
+		syncprov_sendinfo( op, rs, LDAP_TAG_SYNC_ID_SET, NULL, 0, uuids, 1 );
 	}
-	op->o_tmpfree( uuids, op->o_tmpmemctx );
 }
 
 static int
@@ -1503,14 +1424,13 @@ syncprov_op_response( Operation *op, Sla
 
 	if ( rs->sr_err == LDAP_SUCCESS )
 	{
-		struct berval maxcsn = BER_BVNULL;
+		struct berval maxcsn = BER_BVNULL, curcsn = BER_BVNULL;
 		char cbuf[LDAP_LUTIL_CSNSTR_BUFSIZE];
-		int do_check=0;
 
 		/* Update our context CSN */
 		cbuf[0] = '\0';
-		ldap_pvt_thread_rdwr_wlock( &si->si_csn_rwlock );
-		slap_get_commit_csn( op, &maxcsn );
+		ldap_pvt_thread_mutex_lock( &si->si_csn_mutex );
+		slap_get_commit_csn( op, &maxcsn, &curcsn );
 		if ( !BER_BVISNULL( &maxcsn ) ) {
 			strcpy( cbuf, maxcsn.bv_val );
 			if ( ber_bvcmp( &maxcsn, &si->si_ctxcsn ) > 0 ) {
@@ -1522,12 +1442,13 @@ syncprov_op_response( Operation *op, Sla
 		/* 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 );
+			ldap_pvt_thread_mutex_unlock( &si->si_csn_mutex );
 			return SLAP_CB_CONTINUE;
 		}
 
 		si->si_numops++;
 		if ( si->si_chkops || si->si_chktime ) {
+			int do_check=0;
 			if ( si->si_chkops && si->si_numops >= si->si_chkops ) {
 				do_check = 1;
 				si->si_numops = 0;
@@ -1537,14 +1458,11 @@ syncprov_op_response( Operation *op, Sla
 				do_check = 1;
 				si->si_chklast = op->o_time;
 			}
+			if ( do_check ) {
+				syncprov_checkpoint( op, rs, on );
+			}
 		}
-		ldap_pvt_thread_rdwr_wunlock( &si->si_csn_rwlock );
-
-		if ( do_check ) {
-			ldap_pvt_thread_rdwr_rlock( &si->si_csn_rwlock );
-			syncprov_checkpoint( op, rs, on );
-			ldap_pvt_thread_rdwr_runlock( &si->si_csn_rwlock );
-		}
+		ldap_pvt_thread_mutex_unlock( &si->si_csn_mutex );
 
 		opc->sctxcsn.bv_len = maxcsn.bv_len;
 		opc->sctxcsn.bv_val = cbuf;
@@ -1573,7 +1491,7 @@ syncprov_op_response( Operation *op, Sla
 
 		/* Add any log records */
 		if ( si->si_logs && op->o_tag != LDAP_REQ_ADD ) {
-			syncprov_add_slog( op );
+			syncprov_add_slog( op, &curcsn );
 		}
 
 	}
@@ -1608,7 +1526,7 @@ syncprov_op_compare( Operation *op, Slap
 		a.a_vals = bv;
 		a.a_nvals = a.a_vals;
 
-		ldap_pvt_thread_rdwr_rlock( &si->si_csn_rwlock );
+		ldap_pvt_thread_mutex_lock( &si->si_csn_mutex );
 
 		rs->sr_err = access_allowed( op, &e, op->oq_compare.rs_ava->aa_desc,
 			&op->oq_compare.rs_ava->aa_value, ACL_COMPARE, NULL );
@@ -1637,7 +1555,7 @@ syncprov_op_compare( Operation *op, Slap
 
 return_results:;
 
-		ldap_pvt_thread_rdwr_runlock( &si->si_csn_rwlock );
+		ldap_pvt_thread_mutex_unlock( &si->si_csn_mutex );
 
 		send_ldap_result( op, rs );
 
@@ -1808,15 +1726,7 @@ syncprov_detach_op( Operation *op, synco
 	op2->ors_filterstr.bv_val = ptr;
 	strcpy( ptr, so->s_filterstr.bv_val );
 	op2->ors_filterstr.bv_len = so->s_filterstr.bv_len;
-
-	/* Skip the AND/GE clause that we stuck on in front */
-	if ( so->s_flags & PS_FIX_FILTER ) {
-		op2->ors_filter = op->ors_filter->f_and->f_next;
-		so->s_flags ^= PS_FIX_FILTER;
-	} else {
-		op2->ors_filter = op->ors_filter;
-	}
-	op2->ors_filter = filter_dup( op2->ors_filter, NULL );
+	op2->ors_filter = str2filter( ptr );
 	so->s_op = op2;
 
 	/* Copy any cached group ACLs individually */
@@ -1838,9 +1748,6 @@ syncprov_detach_op( Operation *op, synco
 	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;
 }
 
 static int
@@ -1863,28 +1770,15 @@ syncprov_search_response( Operation *op,
 			return SLAP_CB_CONTINUE;
 		}
 		a = attr_find( rs->sr_entry->e_attrs, slap_schema.si_ad_entryCSN );
-		if ( a == NULL && rs->sr_operational_attrs != NULL ) {
-			a = attr_find( rs->sr_operational_attrs, slap_schema.si_ad_entryCSN );
-		}
 		if ( a ) {
-			/* Make sure entry is less than the snapshot'd contextCSN */
-			if ( ber_bvcmp( &a->a_nvals[0], &ss->ss_ctxcsn ) > 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.bv_val );
+			/* Make sure entry is less than the snaphot'd contextCSN */
+			if ( ber_bvcmp( &a->a_nvals[0], &ss->ss_ctxcsn ) > 0 )
 				return LDAP_SUCCESS;
-			}
 
 			/* Don't send the ctx entry twice */
 			if ( !BER_BVISNULL( &srs->sr_state.ctxcsn ) &&
-				bvmatch( &a->a_nvals[0], &srs->sr_state.ctxcsn ) ) {
-				Debug( LDAP_DEBUG_SYNC, "Entry %s CSN %s matches ctx %s\n",
-					rs->sr_entry->e_name.bv_val,
-					a->a_nvals[0].bv_val,
-					srs->sr_state.ctxcsn.bv_val );
+				bvmatch( &a->a_nvals[0], &srs->sr_state.ctxcsn ) )
 				return LDAP_SUCCESS;
-			}
 		}
 		rs->sr_ctrls = op->o_tmpalloc( sizeof(LDAPControl *)*2,
 			op->o_tmpmemctx );
@@ -1905,13 +1799,15 @@ syncprov_search_response( Operation *op,
 			rs->sr_err = syncprov_done_ctrl( op, rs, rs->sr_ctrls,
 				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_present ?
+			syncprov_sendinfo( op, rs, ( ss->ss_present && rs->sr_nentries ) ?
 	 			LDAP_TAG_SYNC_REFRESH_PRESENT : LDAP_TAG_SYNC_REFRESH_DELETE,
 				&cookie, 1, NULL, 0 );
-			op->o_tmpfree( cookie.bv_val, op->o_tmpmemctx );
+			/* Flush any queued persist messages */
+			if ( ss->ss_so->s_res ) {
+				syncprov_qplay( op, on, ss->ss_so );
+			}
 
 			/* Detach this Op from frontend control */
 			ldap_pvt_thread_mutex_lock( &ss->ss_so->s_mutex );
@@ -1920,10 +1816,6 @@ syncprov_search_response( Operation *op,
 			ss->ss_so->s_flags ^= PS_IS_REFRESHING;
 
 			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;
@@ -1973,12 +1865,10 @@ syncprov_op_search( Operation *op, SlapR
 		/* syncprov_findbase expects to be called as a callback... */
 		sc.sc_private = &opc;
 		opc.son = on;
-		ldap_pvt_thread_mutex_init( &so.s_mutex );
 		cb = op->o_callback;
 		op->o_callback = &sc;
 		rs->sr_err = syncprov_findbase( op, &fc );
 		op->o_callback = cb;
-		ldap_pvt_thread_mutex_destroy( &so.s_mutex );
 
 		if ( rs->sr_err != LDAP_SUCCESS ) {
 			send_ldap_result( op, rs );
@@ -1997,10 +1887,10 @@ syncprov_op_search( Operation *op, SlapR
 	}
 
 	/* snapshot the ctxcsn */
-	ldap_pvt_thread_rdwr_rlock( &si->si_csn_rwlock );
+	ldap_pvt_thread_mutex_lock( &si->si_csn_mutex );
 	strcpy( csnbuf, si->si_ctxcsnbuf );
 	ctxcsn.bv_len = si->si_ctxcsn.bv_len;
-	ldap_pvt_thread_rdwr_runlock( &si->si_csn_rwlock );
+	ldap_pvt_thread_mutex_unlock( &si->si_csn_mutex );
 	ctxcsn.bv_val = csnbuf;
 	
 	/* If we have a cookie, handle the PRESENT lookups */
@@ -2031,13 +1921,10 @@ syncprov_op_search( Operation *op, SlapR
 		sl=si->si_logs;
 		if ( sl ) {
 			ldap_pvt_thread_mutex_lock( &sl->sl_mutex );
-			/* Are there any log entries, and is the consumer state
-			 * present in the session log?
-			 */
-			if ( sl->sl_num > 0 && ber_bvcmp( &srs->sr_state.ctxcsn, &sl->sl_mincsn ) >= 0 ) {
+			if ( ber_bvcmp( &srs->sr_state.ctxcsn, &sl->sl_mincsn ) >= 0 ) {
 				do_present = 0;
 				/* mutex is unlocked in playlog */
-				syncprov_playlog( op, rs, sl, srs, &ctxcsn );
+				syncprov_playlog( op, rs, sl, &srs->sr_state.ctxcsn, &ctxcsn );
 			} else {
 				ldap_pvt_thread_mutex_unlock( &sl->sl_mutex );
 			}
@@ -2045,11 +1932,12 @@ syncprov_op_search( Operation *op, SlapR
 		/* Is the CSN still present in the database? */
 		if ( syncprov_findcsn( op, FIND_CSN ) != LDAP_SUCCESS ) {
 			/* No, so a reload is required */
-			/* the 2.2 consumer doesn't send this hint */
-			if ( si->si_usehint && srs->sr_rhint == 0 ) {
+#if 0		/* the consumer doesn't seem to send this hint */
+			if ( op->o_sync_rhint == 0 ) {
 				send_ldap_error( op, rs, LDAP_SYNC_REFRESH_REQUIRED, "sync cookie is stale" );
 				return rs->sr_err;
 			}
+#endif
 		} else {
 			gotstate = 1;
 			/* If changed and doing Present lookup, send Present UUIDs */
@@ -2088,8 +1976,6 @@ shortcut:
 		fava->f_next = op->ors_filter;
 		op->ors_filter = fand;
 		filter2bv_x( op, op->ors_filter, &op->ors_filterstr );
-		if ( sop )
-			sop->s_flags |= PS_FIX_FILTER;
 	}
 
 	/* Let our callback add needed info to returned entries */
@@ -2157,13 +2043,13 @@ syncprov_operational(
 				*ap = a;
 			}
 
-			ldap_pvt_thread_rdwr_rlock( &si->si_csn_rwlock );
+			ldap_pvt_thread_mutex_lock( &si->si_csn_mutex );
 			if ( !ap ) {
 				strcpy( a->a_vals[0].bv_val, si->si_ctxcsnbuf );
 			} else {
 				ber_dupbv( &a->a_vals[0], &si->si_ctxcsn );
 			}
-			ldap_pvt_thread_rdwr_runlock( &si->si_csn_rwlock );
+			ldap_pvt_thread_mutex_unlock( &si->si_csn_mutex );
 		}
 	}
 	return SLAP_CB_CONTINUE;
@@ -2172,8 +2058,7 @@ syncprov_operational(
 enum {
 	SP_CHKPT = 1,
 	SP_SESSL,
-	SP_NOPRES,
-	SP_USEHINT
+	SP_NOPRES
 };
 
 static ConfigDriver sp_cf_gen;
@@ -2191,10 +2076,6 @@ static ConfigTable spcfg[] = {
 		sp_cf_gen, "( OLcfgOvAt:1.3 NAME 'olcSpNoPresent' "
 			"DESC 'Omit Present phase processing' "
 			"SYNTAX OMsBoolean SINGLE-VALUE )", NULL, NULL },
-	{ "syncprov-reloadhint", NULL, 2, 2, 0, ARG_ON_OFF|ARG_MAGIC|SP_USEHINT,
-		sp_cf_gen, "( OLcfgOvAt:1.4 NAME 'olcSpReloadHint' "
-			"DESC 'Observe Reload Hint in Request control' "
-			"SYNTAX OMsBoolean SINGLE-VALUE )", NULL, NULL },
 	{ NULL, NULL, 0, 0, 0, ARG_IGNORED }
 };
 
@@ -2242,13 +2123,6 @@ sp_cf_gen(ConfigArgs *c)
 				rc = 1;
 			}
 			break;
-		case SP_USEHINT:
-			if ( si->si_usehint ) {
-				c->value_int = 1;
-			} else {
-				rc = 1;
-			}
-			break;
 		}
 		return rc;
 	} else if ( c->op == LDAP_MOD_DELETE ) {
@@ -2269,56 +2143,22 @@ sp_cf_gen(ConfigArgs *c)
 			else
 				rc = LDAP_NO_SUCH_ATTRIBUTE;
 			break;
-		case SP_USEHINT:
-			if ( si->si_usehint )
-				si->si_usehint = 0;
-			else
-				rc = LDAP_NO_SUCH_ATTRIBUTE;
-			break;
 		}
 		return rc;
 	}
 	switch ( c->type ) {
 	case SP_CHKPT:
-		if ( lutil_atoi( &si->si_chkops, c->argv[1] ) != 0 ) {
-			snprintf( c->msg, sizeof( c->msg ), "%s unable to parse checkpoint ops # \"%s\"",
-				c->argv[0], c->argv[1] );
-			Debug( LDAP_DEBUG_CONFIG|LDAP_DEBUG_NONE,
-				"%s: %s\n", c->log, c->msg, 0 );
-			return ARG_BAD_CONF;
-		}
-		if ( si->si_chkops <= 0 ) {
-			snprintf( c->msg, sizeof( c->msg ), "%s invalid checkpoint ops # \"%d\"",
-				c->argv[0], si->si_chkops );
-			Debug( LDAP_DEBUG_CONFIG|LDAP_DEBUG_NONE,
-				"%s: %s\n", c->log, c->msg, 0 );
-			return ARG_BAD_CONF;
-		}
-		if ( lutil_atoi( &si->si_chktime, c->argv[2] ) != 0 ) {
-			snprintf( c->msg, sizeof( c->msg ), "%s unable to parse checkpoint time \"%s\"",
-				c->argv[0], c->argv[1] );
-			Debug( LDAP_DEBUG_CONFIG|LDAP_DEBUG_NONE,
-				"%s: %s\n", c->log, c->msg, 0 );
-			return ARG_BAD_CONF;
-		}
-		if ( si->si_chktime <= 0 ) {
-			snprintf( c->msg, sizeof( c->msg ), "%s invalid checkpoint time \"%d\"",
-				c->argv[0], si->si_chkops );
-			Debug( LDAP_DEBUG_CONFIG|LDAP_DEBUG_NONE,
-				"%s: %s\n", c->log, c->msg, 0 );
-			return ARG_BAD_CONF;
-		}
-		si->si_chktime *= 60;
+		si->si_chkops = atoi( c->argv[1] );
+		si->si_chktime = atoi( c->argv[2] ) * 60;
 		break;
 	case SP_SESSL: {
 		sessionlog *sl;
 		int size = c->value_int;
 
 		if ( size < 0 ) {
-			snprintf( c->msg, sizeof( c->msg ), "%s size %d is negative",
+			sprintf( c->msg, "%s size %d is negative",
 				c->argv[0], size );
-			Debug( LDAP_DEBUG_CONFIG|LDAP_DEBUG_NONE,
-				"%s: %s\n", c->log, c->msg, 0 );
+			Debug( LDAP_DEBUG_CONFIG, "%s: %s\n", c->log, c->msg, 0 );
 			return ARG_BAD_CONF;
 		}
 		sl = si->si_logs;
@@ -2337,9 +2177,6 @@ sp_cf_gen(ConfigArgs *c)
 	case SP_NOPRES:
 		si->si_nopres = c->value_int;
 		break;
-	case SP_USEHINT:
-		si->si_usehint = c->value_int;
-		break;
 	}
 	return rc;
 }
@@ -2368,21 +2205,15 @@ syncprov_db_open(
 	slap_overinst   *on = (slap_overinst *) be->bd_info;
 	syncprov_info_t *si = (syncprov_info_t *)on->on_bi.bi_private;
 
-	Connection conn = { 0 };
-	OperationBuffer opbuf = { 0 };
+	Connection conn;
+	char opbuf[OPERATION_BUFFER_SIZE];
 	char ctxcsnbuf[LDAP_LUTIL_CSNSTR_BUFSIZE];
-	Operation *op = (Operation *) &opbuf;
+	Operation *op = (Operation *)opbuf;
 	Entry *e;
 	Attribute *a;
 	int rc;
 	void *thrctx = NULL;
 
-	if ( !SLAP_LASTMOD( be )) {
-		Debug( LDAP_DEBUG_ANY,
-			"syncprov_db_open: invalid config, lastmod must be enabled\n", 0, 0, 0 );
-		return -1;
-	}
-
 	if ( slapMode & SLAP_TOOL_MODE ) {
 		return 0;
 	}
@@ -2418,26 +2249,23 @@ syncprov_db_open(
 			strcpy( ctxcsnbuf, si->si_ctxcsnbuf );
 		}
 		be_entry_release_rw( op, e, 0 );
-		if ( !BER_BVISEMPTY( &si->si_ctxcsn ) ) {
-			op->o_bd->bd_info = (BackendInfo *)on;
-			op->o_req_dn = be->be_suffix[0];
-			op->o_req_ndn = be->be_nsuffix[0];
-			op->ors_scope = LDAP_SCOPE_SUBTREE;
-			ldap_pvt_thread_create( &tid, 0, syncprov_db_otask, op );
-			ldap_pvt_thread_join( tid, NULL );
-		}
-	}
-
-	if ( BER_BVISEMPTY( &si->si_ctxcsn ) ) {
-		if ( SLAP_SYNC_SHADOW( op->o_bd )) {
-		/* If we're also a consumer, and we didn't get a contextCSN,
+		op->o_bd->bd_info = (BackendInfo *)on;
+		op->o_req_dn = be->be_suffix[0];
+		op->o_req_ndn = be->be_nsuffix[0];
+		op->ors_scope = LDAP_SCOPE_SUBTREE;
+		ldap_pvt_thread_create( &tid, 0, syncprov_db_otask, op );
+		ldap_pvt_thread_join( tid, NULL );
+	} else if ( SLAP_SYNC_SHADOW( op->o_bd )) {
+		/* If we're also a consumer, and we didn't find the context entry,
 		 * then don't generate anything, wait for our provider to send it
 		 * to us.
 		 */
-			goto out;
-		}
-		si->si_ctxcsn.bv_len = sizeof( si->si_ctxcsnbuf );
-		slap_get_csn( op, &si->si_ctxcsn, 0 );
+		goto out;
+	}
+
+	if ( BER_BVISEMPTY( &si->si_ctxcsn ) ) {
+		slap_get_csn( op, si->si_ctxcsnbuf, sizeof(si->si_ctxcsnbuf),
+				&si->si_ctxcsn, 0 );
 	}
 
 	/* If our ctxcsn is different from what was read from the root
@@ -2449,6 +2277,7 @@ syncprov_db_open(
 
 out:
 	op->o_bd->bd_info = (BackendInfo *)on;
+	ldap_pvt_thread_pool_context_reset( thrctx );
 	return 0;
 }
 
@@ -2467,8 +2296,8 @@ syncprov_db_close(
 	}
 	if ( si->si_numops ) {
 		Connection conn;
-		OperationBuffer opbuf;
-		Operation *op = (Operation *) &opbuf;
+		char opbuf[OPERATION_BUFFER_SIZE];
+		Operation *op = (Operation *)opbuf;
 		SlapReply rs = {REP_RESULT};
 		void *thrctx;
 
@@ -2478,6 +2307,7 @@ syncprov_db_close(
 		op->o_dn = be->be_rootdn;
 		op->o_ndn = be->be_rootndn;
 		syncprov_checkpoint( op, &rs, on );
+		ldap_pvt_thread_pool_context_reset( thrctx );
 	}
 
     return 0;
@@ -2491,16 +2321,9 @@ syncprov_db_init(
 	slap_overinst	*on = (slap_overinst *)be->bd_info;
 	syncprov_info_t	*si;
 
-	if ( SLAP_ISGLOBALOVERLAY( be ) ) {
-		Debug( LDAP_DEBUG_ANY,
-			"syncprov must be instantiated within a database.\n",
-			0, 0, 0 );
-		return 1;
-	}
-
 	si = ch_calloc(1, sizeof(syncprov_info_t));
 	on->on_bi.bi_private = si;
-	ldap_pvt_thread_rdwr_init( &si->si_csn_rwlock );
+	ldap_pvt_thread_mutex_init( &si->si_csn_mutex );
 	ldap_pvt_thread_mutex_init( &si->si_ops_mutex );
 	ldap_pvt_thread_mutex_init( &si->si_mods_mutex );
 	si->si_ctxcsn.bv_val = si->si_ctxcsnbuf;
@@ -2525,20 +2348,9 @@ syncprov_db_destroy(
 	syncprov_info_t	*si = (syncprov_info_t *)on->on_bi.bi_private;
 
 	if ( si ) {
-		if ( si->si_logs ) {
-			slog_entry *se = si->si_logs->sl_head;
-
-			while ( se ) {
-				slog_entry *se_next = se->se_next;
-				ch_free( se );
-				se = se_next;
-			}
-				
-			ch_free( si->si_logs );
-		}
 		ldap_pvt_thread_mutex_destroy( &si->si_mods_mutex );
 		ldap_pvt_thread_mutex_destroy( &si->si_ops_mutex );
-		ldap_pvt_thread_rdwr_destroy( &si->si_csn_rwlock );
+		ldap_pvt_thread_mutex_destroy( &si->si_csn_mutex );
 		ch_free( si );
 	}
 
@@ -2612,7 +2424,6 @@ static int syncprov_parseCtrl (
 			rs->sr_text = "Sync control : cookie decoding error";
 			return LDAP_PROTOCOL_ERROR;
 		}
-		tag = ber_peek_tag( ber, &len );
 	}
 	if ( tag == LDAP_TAG_RELOAD_HINT ) {
 		if (( ber_scanf( ber, /*{*/ "b", &rhint )) == LBER_ERROR ) {
@@ -2628,8 +2439,8 @@ 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 ( slap_parse_sync_cookie( &sr->sr_state, op->o_tmpmemctx ) ||
-			sr->sr_state.rid == -1 ) {
+		slap_parse_sync_cookie( &sr->sr_state, op->o_tmpmemctx );
+		if ( sr->sr_state.rid == -1 ) {
 			rs->sr_text = "Sync control : cookie parsing error";
 			return LDAP_PROTOCOL_ERROR;
 		}
@@ -2654,12 +2465,12 @@ static int syncprov_parseCtrl (
 static slap_overinst 		syncprov;
 
 int
-syncprov_initialize()
+syncprov_init()
 {
 	int rc;
 
 	rc = register_supported_control( LDAP_CONTROL_SYNC,
-		SLAP_CTRL_SEARCH, NULL,
+		SLAP_CTRL_HIDE|SLAP_CTRL_SEARCH, NULL,
 		syncprov_parseCtrl, &slap_cids.sc_LDAPsync );
 	if ( rc != LDAP_SUCCESS ) {
 		Debug( LDAP_DEBUG_ANY,
@@ -2687,8 +2498,6 @@ syncprov_initialize()
 
 	syncprov.on_bi.bi_cf_ocs = spocs;
 
-	generic_filter.f_desc = slap_schema.si_ad_objectClass;
-
 	rc = config_register_schema( spcfg, spocs );
 	if ( rc ) return rc;
 
@@ -2699,7 +2508,7 @@ syncprov_initialize()
 int
 init_module( int argc, char *argv[] )
 {
-	return syncprov_initialize();
+	return syncprov_init();
 }
 #endif /* SLAPD_OVER_SYNCPROV == SLAPD_MOD_DYNAMIC */