servers/slapd/overlays/syncprov.c - diff

Return to syncprov.c CVS log

Up to [OpenLDAP] / servers / slapd / overlays

Diff for /servers/slapd/overlays/syncprov.c between versions 1.147.2.81 and 1.189

version 1.147.2.81, 2011/01/04 17:23:13	version 1.189, 2007/05/19 12:12:24
Line 1	Line 1
/* $OpenLDAP$ */	/* $OpenLDAP: pkg/ldap/servers/slapd/overlays/syncprov.c,v 1.188 2007/05/18 21:54:27 hallvard Exp $ */
/* syncprov.c - syncrepl provider */	/* syncprov.c - syncrepl provider */
/* This work is part of OpenLDAP Software <http://www.openldap.org/>.	/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
*	*
* Copyright 2004-2010 The OpenLDAP Foundation.	* Copyright 2004-2007 The OpenLDAP Foundation.
* All rights reserved.	* All rights reserved.
*	*
* Redistribution and use in source and binary forms, with or without	* Redistribution and use in source and binary forms, with or without
Line 28	Line 28
#include "config.h"	#include "config.h"
#include "ldap_rq.h"	#include "ldap_rq.h"

#ifdef LDAP_DEVEL
#define CHECK_CSN 1
#endif

/* A modify request on a particular entry */	/* A modify request on a particular entry */
typedef struct modinst {	typedef struct modinst {
struct modinst *mi_next;	struct modinst *mi_next;
Line 48 typedef struct modtarget {	Line 44 typedef struct modtarget {
/* A queued result of a persistent search */	/* A queued result of a persistent search */
typedef struct syncres {	typedef struct syncres {
struct syncres *s_next;	struct syncres *s_next;
Entry *s_e;
struct berval s_dn;	struct berval s_dn;
struct berval s_ndn;	struct berval s_ndn;
struct berval s_uuid;	struct berval s_uuid;
Line 72 typedef struct syncops {	Line 67 typedef struct syncops {
#define PS_WROTE_BASE 0x04	#define PS_WROTE_BASE 0x04
#define PS_FIND_BASE 0x08	#define PS_FIND_BASE 0x08
#define PS_FIX_FILTER 0x10	#define PS_FIX_FILTER 0x10
#define PS_TASK_QUEUED 0x20

int s_inuse; /* reference count */	int s_inuse; /* reference count */
struct syncres *s_res;	struct syncres *s_res;
struct syncres *s_restail;	struct syncres *s_restail;
	struct re_s s_qtask; / task for playing psearch responses */
	#define RUNQ_INTERVAL 36000 /* a long time */
ldap_pvt_thread_mutex_t s_mutex;	ldap_pvt_thread_mutex_t s_mutex;
} syncops;	} syncops;

Line 113 typedef struct slog_entry {	Line 109 typedef struct slog_entry {
} slog_entry;	} slog_entry;

typedef struct sessionlog {	typedef struct sessionlog {
	struct berval sl_mincsn;
int sl_num;	int sl_num;
int sl_size;	int sl_size;
slog_entry *sl_head;	slog_entry *sl_head;
Line 124 typedef struct sessionlog {	Line 121 typedef struct sessionlog {
typedef struct syncprov_info_t {	typedef struct syncprov_info_t {
syncops *si_ops;	syncops *si_ops;
BerVarray si_ctxcsn; /* ldapsync context */	BerVarray si_ctxcsn; /* ldapsync context */
struct berval si_contextdn;
int *si_sids;	int *si_sids;
int si_numcsns;	int si_numcsns;
int si_chkops; /* checkpointing info */	int si_chkops; /* checkpointing info */
Line 132 typedef struct syncprov_info_t {	Line 128 typedef struct syncprov_info_t {
int si_numops; /* number of ops since last checkpoint */	int si_numops; /* number of ops since last checkpoint */
int si_nopres; /* Skip present phase */	int si_nopres; /* Skip present phase */
int si_usehint; /* use reload hint */	int si_usehint; /* use reload hint */
int si_active; /* True if there are active mods */
int si_dirty; /* True if the context is dirty, i.e changes
* have been made without updating the csn. */
time_t si_chklast; /* time of last checkpoint */	time_t si_chklast; /* time of last checkpoint */
Avlnode si_mods; / entries being modified */	Avlnode si_mods; / entries being modified */
sessionlog *si_logs;	sessionlog *si_logs;
ldap_pvt_thread_rdwr_t si_csn_rwlock;	ldap_pvt_thread_rdwr_t si_csn_rwlock;
ldap_pvt_thread_mutex_t si_ops_mutex;	ldap_pvt_thread_mutex_t si_ops_mutex;
ldap_pvt_thread_mutex_t si_mods_mutex;	ldap_pvt_thread_mutex_t si_mods_mutex;
ldap_pvt_thread_mutex_t si_resp_mutex;
} syncprov_info_t;	} syncprov_info_t;

typedef struct opcookie {	typedef struct opcookie {
slap_overinst *son;	slap_overinst *son;
syncmatches *smatches;	syncmatches *smatches;
modtarget *smt;
Entry *se;
struct berval sdn; /* DN of entry, for deletes */	struct berval sdn; /* DN of entry, for deletes */
struct berval sndn;	struct berval sndn;
struct berval suuid; /* UUID of entry */	struct berval suuid; /* UUID of entry */
struct berval sctxcsn;	struct berval sctxcsn;
short osid; /* sid of op csn */	int sreference; /* Is the entry a reference? */
short rsid; /* sid of relay */
short sreference; /* Is the entry a reference? */
} opcookie;	} opcookie;

typedef struct mutexint {
ldap_pvt_thread_mutex_t mi_mutex;
int mi_int;
} mutexint;

typedef struct fbase_cookie {	typedef struct fbase_cookie {
struct berval fdn; / DN of a modified entry, for scope testing */	struct berval fdn; / DN of a modified entry, for scope testing */
syncops fss; / persistent search we're testing against */	syncops fss; / persistent search we're testing against */
Line 410 static struct berval generic_filterstr =	Line 393 static struct berval generic_filterstr =
static int	static int
syncprov_findbase( Operation op, fbase_cookie fc )	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	/* Use basic parameters from syncrepl search, but use
* current op's threadctx / tmpmemctx	* current op's threadctx / tmpmemctx
*/	*/
Line 418 syncprov_findbase( Operation *op, fbase_	Line 404 syncprov_findbase( Operation *op, fbase_
slap_callback cb = {0};	slap_callback cb = {0};
Operation fop;	Operation fop;
SlapReply frs = { REP_RESULT };	SlapReply frs = { REP_RESULT };
	BackendInfo *bi;
int rc;	int rc;

fc->fss->s_flags ^= PS_FIND_BASE;	fc->fss->s_flags ^= PS_FIND_BASE;
Line 425 syncprov_findbase( Operation *op, fbase_	Line 412 syncprov_findbase( Operation *op, fbase_

fop = *fc->fss->s_op;	fop = *fc->fss->s_op;

fop.o_bd = fop.o_bd->bd_self;
fop.o_hdr = op->o_hdr;	fop.o_hdr = op->o_hdr;
	fop.o_bd = op->o_bd;
fop.o_time = op->o_time;	fop.o_time = op->o_time;
fop.o_tincr = op->o_tincr;	fop.o_tincr = op->o_tincr;
	bi = op->o_bd->bd_info;

cb.sc_response = findbase_cb;	cb.sc_response = findbase_cb;
cb.sc_private = fc;	cb.sc_private = fc;
Line 446 syncprov_findbase( Operation *op, fbase_	Line 434 syncprov_findbase( Operation *op, fbase_
fop.ors_filter = &generic_filter;	fop.ors_filter = &generic_filter;
fop.ors_filterstr = generic_filterstr;	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 {	} else {
ldap_pvt_thread_mutex_unlock( &fc->fss->s_mutex );	ldap_pvt_thread_mutex_unlock( &fc->fss->s_mutex );
fc->fbase = 1;	fc->fbase = 1;
Line 511 findmax_cb( Operation op, SlapReply rs	Line 500 findmax_cb( Operation op, SlapReply rs
Attribute *a = attr_find( rs->sr_entry->e_attrs,	Attribute *a = attr_find( rs->sr_entry->e_attrs,
slap_schema.si_ad_entryCSN );	slap_schema.si_ad_entryCSN );

if ( a && ber_bvcmp( &a->a_vals[0], maxcsn ) > 0 &&	if ( a && ber_bvcmp( &a->a_vals[0], maxcsn ) > 0 ) {
slap_parse_csn_sid( &a->a_vals[0] ) == slap_serverID ) {
maxcsn->bv_len = a->a_vals[0].bv_len;	maxcsn->bv_len = a->a_vals[0].bv_len;
strcpy( maxcsn->bv_val, a->a_vals[0].bv_val );	strcpy( maxcsn->bv_val, a->a_vals[0].bv_val );
}	}
Line 593 syncprov_findcsn( Operation *op, find_cs	Line 581 syncprov_findcsn( Operation *op, find_cs
slap_callback cb = {0};	slap_callback cb = {0};
Operation fop;	Operation fop;
SlapReply frs = { REP_RESULT };	SlapReply frs = { REP_RESULT };
char buf[LDAP_PVT_CSNSTR_BUFSIZE + STRLENOF("(entryCSN<=)")];	char buf[LDAP_LUTIL_CSNSTR_BUFSIZE + STRLENOF("(entryCSN<=)")];
char cbuf[LDAP_PVT_CSNSTR_BUFSIZE];	char cbuf[LDAP_LUTIL_CSNSTR_BUFSIZE];
struct berval maxcsn;	struct berval maxcsn;
Filter cf;	Filter cf;
AttributeAssertion eq = ATTRIBUTEASSERTION_INIT;	#ifdef LDAP_COMP_MATCH
	AttributeAssertion eq = { NULL, BER_BVNULL, NULL };
	#else
	AttributeAssertion eq = { NULL, BER_BVNULL };
	#endif
fpres_cookie pcookie;	fpres_cookie pcookie;
sync_control *srs = NULL;	sync_control *srs = NULL;
struct slap_limits_set fc_limits;	struct slap_limits_set fc_limits;
int i, rc = LDAP_SUCCESS, findcsn_retry = 1;	int i, rc = LDAP_SUCCESS, findcsn_retry = 1;
int maxid;	int maxid = 0;

if ( mode != FIND_MAXCSN ) {	if ( mode != FIND_MAXCSN ) {
srs = op->o_controls[slap_cids.sc_LDAPsync];	srs = op->o_controls[slap_cids.sc_LDAPsync];
Line 628 again:	Line 620 again:
switch( mode ) {	switch( mode ) {
case FIND_MAXCSN:	case FIND_MAXCSN:
cf.f_choice = LDAP_FILTER_GE;	cf.f_choice = LDAP_FILTER_GE;
/* If there are multiple CSNs, use the one with our serverID */	cf.f_av_value = si->si_ctxcsn[0];
for ( i=0; i<si->si_numcsns; i++) {	/* If there are multiple CSNs, use the largest */
if ( slap_serverID == si->si_sids[i] ) {	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;	maxid = i;
break;
}	}
}	}
if ( i == si->si_numcsns ) {	fop.ors_filterstr.bv_len = sprintf( buf, "(entryCSN>=%s)",
/* No match: this is multimaster, and none of the content in the DB	cf.f_av_value.bv_val );
* 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_attrsonly = 0;	fop.ors_attrsonly = 0;
fop.ors_attrs = csn_anlist;	fop.ors_attrs = csn_anlist;
fop.ors_slimit = SLAP_NO_LIMIT;	fop.ors_slimit = SLAP_NO_LIMIT;
Line 670 again:	Line 653 again:
/* Look for exact match the first time */	/* Look for exact match the first time */
if ( findcsn_retry ) {	if ( findcsn_retry ) {
cf.f_choice = LDAP_FILTER_EQUALITY;	cf.f_choice = LDAP_FILTER_EQUALITY;
fop.ors_filterstr.bv_len = snprintf( buf, sizeof( buf ),	fop.ors_filterstr.bv_len = sprintf( buf, "(entryCSN=%s)",
"(entryCSN=%s)", cf.f_av_value.bv_val );	cf.f_av_value.bv_val );
/* On retry, look for <= */	/* On retry, look for <= */
} else {	} else {
cf.f_choice = LDAP_FILTER_LE;	cf.f_choice = LDAP_FILTER_LE;
fop.ors_limit = &fc_limits;	fop.ors_limit = &fc_limits;
memset( &fc_limits, 0, sizeof( fc_limits ));
fc_limits.lms_s_unchecked = 1;	fc_limits.lms_s_unchecked = 1;
fop.ors_filterstr.bv_len = snprintf( buf, sizeof( buf ),	fop.ors_filterstr.bv_len = sprintf( buf, "(entryCSN<=%s)",
"(entryCSN<=%s)", cf.f_av_value.bv_val );	cf.f_av_value.bv_val );
}
if ( fop.ors_filterstr.bv_len >= sizeof( buf ) ) {
return LDAP_OTHER;
}	}
fop.ors_attrsonly = 1;	fop.ors_attrsonly = 1;
fop.ors_attrs = slap_anlist_no_attrs;	fop.ors_attrs = slap_anlist_no_attrs;
Line 714 again:	Line 693 again:
break;	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->be_search( &fop, &frs );
fop.o_bd->bd_info = (BackendInfo *)on;	fop.o_bd->bd_info = (BackendInfo *)on;

switch( mode ) {	switch( mode ) {
case FIND_MAXCSN:	case FIND_MAXCSN:
if ( ber_bvcmp( &si->si_ctxcsn[maxid], &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 );	ber_bvreplace( &si->si_ctxcsn[maxid], &maxcsn );
si->si_numops++; /* ensure a checkpoint */	si->si_numops++; /* ensure a checkpoint */
}	}
Line 748 again:	Line 723 again:
return rc;	return rc;
}	}

/* Should find a place to cache these */
static mutexint *get_mutexint()
{
mutexint *mi = ch_malloc( sizeof( mutexint ));
ldap_pvt_thread_mutex_init( &mi->mi_mutex );
mi->mi_int = 1;
return mi;
}

static void inc_mutexint( mutexint *mi )
{
ldap_pvt_thread_mutex_lock( &mi->mi_mutex );
mi->mi_int++;
ldap_pvt_thread_mutex_unlock( &mi->mi_mutex );
}

/* return resulting counter */
static int dec_mutexint( mutexint *mi )
{
int i;
ldap_pvt_thread_mutex_lock( &mi->mi_mutex );
i = --mi->mi_int;
ldap_pvt_thread_mutex_unlock( &mi->mi_mutex );
if ( !i ) {
ldap_pvt_thread_mutex_destroy( &mi->mi_mutex );
ch_free( mi );
}
return i;
}

static void	static void
syncprov_free_syncop( syncops *so )	syncprov_free_syncop( syncops *so )
{	{
Line 801 syncprov_free_syncop( syncops *so )	Line 746 syncprov_free_syncop( syncops *so )
ch_free( so->s_base.bv_val );	ch_free( so->s_base.bv_val );
for ( sr=so->s_res; sr; sr=srnext ) {	for ( sr=so->s_res; sr; sr=srnext ) {
srnext = sr->s_next;	srnext = sr->s_next;
if ( sr->s_e ) {
if ( !dec_mutexint( sr->s_e->e_private )) {
sr->s_e->e_private = NULL;
entry_free( sr->s_e );
}
}
ch_free( sr );	ch_free( sr );
}	}
ldap_pvt_thread_mutex_destroy( &so->s_mutex );	ldap_pvt_thread_mutex_destroy( &so->s_mutex );
Line 815 syncprov_free_syncop( syncops *so )	Line 754 syncprov_free_syncop( syncops *so )

/* Send a persistent search response */	/* Send a persistent search response */
static int	static int
syncprov_sendresp( Operation op, opcookie opc, syncops *so, int mode )	syncprov_sendresp( Operation op, opcookie opc, syncops *so,
	Entry **e, int mode )
{	{
slap_overinst *on = opc->son;	slap_overinst *on = opc->son;

SlapReply rs = { REP_SEARCH };	SlapReply rs = { REP_SEARCH };
LDAPControl *ctrls[2];	LDAPControl *ctrls[2];
struct berval cookie = BER_BVNULL, csns[2];	struct berval cookie, csns[2];
Entry e_uuid = {0};	Entry e_uuid = {0};
Attribute a_uuid = {0};	Attribute a_uuid = {0};

Line 829 syncprov_sendresp( Operation *op, opcook	Line 769 syncprov_sendresp( Operation *op, opcook
return SLAPD_ABANDON;	return SLAPD_ABANDON;

ctrls[1] = NULL;	ctrls[1] = NULL;
if ( !BER_BVISNULL( &opc->sctxcsn )) {	csns[0] = opc->sctxcsn;
csns[0] = opc->sctxcsn;	BER_BVZERO( &csns[1] );
BER_BVZERO( &csns[1] );	slap_compose_sync_cookie( op, &cookie, csns, so->s_rid, so->s_sid );
slap_compose_sync_cookie( op, &cookie, csns, so->s_rid, slap_serverID ? slap_serverID : -1 );
}

#ifdef LDAP_DEBUG
if ( so->s_sid > 0 ) {
Debug( LDAP_DEBUG_SYNC, "syncprov_sendresp: to=%03x, cookie=%s\n",
so->s_sid, cookie.bv_val ? cookie.bv_val : "", 0 );
} else {
Debug( LDAP_DEBUG_SYNC, "syncprov_sendresp: cookie=%s\n",
cookie.bv_val ? cookie.bv_val : "", 0, 0 );
}
#endif

e_uuid.e_attrs = &a_uuid;	e_uuid.e_attrs = &a_uuid;
a_uuid.a_desc = slap_schema.si_ad_entryUUID;	a_uuid.a_desc = slap_schema.si_ad_entryUUID;
a_uuid.a_nvals = &opc->suuid;	a_uuid.a_nvals = &opc->suuid;
rs.sr_err = syncprov_state_ctrl( op, &rs, &e_uuid,	rs.sr_err = syncprov_state_ctrl( op, &rs, &e_uuid,
mode, ctrls, 0, 1, &cookie );	mode, ctrls, 0, 1, &cookie );
if ( !BER_BVISNULL( &cookie )) {	op->o_tmpfree( cookie.bv_val, op->o_tmpmemctx );
op->o_tmpfree( cookie.bv_val, op->o_tmpmemctx );
}

rs.sr_ctrls = ctrls;	rs.sr_ctrls = ctrls;
rs.sr_entry = &e_uuid;	op->o_bd->bd_info = (BackendInfo *)on->on_info;
if ( mode == LDAP_SYNC_ADD \|\| mode == LDAP_SYNC_MODIFY ) {
e_uuid = *opc->se;
e_uuid.e_private = NULL;
}

switch( mode ) {	switch( mode ) {
case LDAP_SYNC_ADD:	case LDAP_SYNC_ADD:
if ( opc->sreference && so->s_op->o_managedsait <= SLAP_CONTROL_IGNORED ) {	rs.sr_entry = *e;
	if ( rs.sr_entry->e_private )
	rs.sr_flags = REP_ENTRY_MUSTRELEASE;
	if ( opc->sreference ) {
rs.sr_ref = get_entry_referrals( op, rs.sr_entry );	rs.sr_ref = get_entry_referrals( op, rs.sr_entry );
rs.sr_err = send_search_reference( op, &rs );	rs.sr_err = send_search_reference( op, &rs );
ber_bvarray_free( rs.sr_ref );	ber_bvarray_free( rs.sr_ref );
	if ( !rs.sr_entry )
	*e = NULL;
break;	break;
}	}
/* fallthru */	/* fallthru */
case LDAP_SYNC_MODIFY:	case LDAP_SYNC_MODIFY:
	rs.sr_entry = *e;
	if ( rs.sr_entry->e_private )
	rs.sr_flags = REP_ENTRY_MUSTRELEASE;
rs.sr_attrs = op->ors_attrs;	rs.sr_attrs = op->ors_attrs;
rs.sr_err = send_search_entry( op, &rs );	rs.sr_err = send_search_entry( op, &rs );
	if ( !rs.sr_entry )
	*e = NULL;
break;	break;
case LDAP_SYNC_DELETE:	case LDAP_SYNC_DELETE:
e_uuid.e_attrs = NULL;	e_uuid.e_attrs = NULL;
e_uuid.e_name = opc->sdn;	e_uuid.e_name = opc->sdn;
e_uuid.e_nname = opc->sndn;	e_uuid.e_nname = opc->sndn;
if ( opc->sreference && so->s_op->o_managedsait <= SLAP_CONTROL_IGNORED ) {	rs.sr_entry = &e_uuid;
	if ( opc->sreference ) {
struct berval bv = BER_BVNULL;	struct berval bv = BER_BVNULL;
rs.sr_ref = &bv;	rs.sr_ref = &bv;
rs.sr_err = send_search_reference( op, &rs );	rs.sr_err = send_search_reference( op, &rs );
Line 891 syncprov_sendresp( Operation *op, opcook	Line 823 syncprov_sendresp( Operation *op, opcook
}	}
/* In case someone else freed it already? */	/* In case someone else freed it already? */
if ( rs.sr_ctrls ) {	if ( rs.sr_ctrls ) {
int i;	op->o_tmpfree( rs.sr_ctrls[0], op->o_tmpmemctx );
for ( i=0; rs.sr_ctrls[i]; i++ ) {
if ( rs.sr_ctrls[i] == ctrls[0] ) {
op->o_tmpfree( ctrls[0]->ldctl_value.bv_val, op->o_tmpmemctx );
ctrls[0]->ldctl_value.bv_val = NULL;
break;
}
}
rs.sr_ctrls = NULL;	rs.sr_ctrls = NULL;
}	}

return rs.sr_err;	return rs.sr_err;
}	}

static void
syncprov_qstart( syncops *so );

/* Play back queued responses */	/* Play back queued responses */
static int	static int
syncprov_qplay( Operation op, syncops so )	syncprov_qplay( Operation op, slap_overinst on, syncops *so )
{	{
slap_overinst *on = LDAP_SLIST_FIRST(&so->s_op->o_extra)->oe_key;
syncres *sr;	syncres *sr;
Entry *e;	Entry *e;
opcookie opc;	opcookie opc;
Line 920 syncprov_qplay( Operation op, syncops	Line 841 syncprov_qplay( Operation op, syncops

opc.son = on;	opc.son = on;

do {	for (;;) {
ldap_pvt_thread_mutex_lock( &so->s_mutex );	ldap_pvt_thread_mutex_lock( &so->s_mutex );
sr = so->s_res;	sr = so->s_res;
if ( sr )	if ( sr )
so->s_res = sr->s_next;	so->s_res = sr->s_next;
if ( !so->s_res )	if ( !so->s_res )
so->s_restail = NULL;	so->s_restail = NULL;
/* Exit loop with mutex held */
if ( !sr \|\| so->s_op->o_abandon )
break;
ldap_pvt_thread_mutex_unlock( &so->s_mutex );	ldap_pvt_thread_mutex_unlock( &so->s_mutex );

if ( sr->s_mode == LDAP_SYNC_NEW_COOKIE ) {	if ( !sr \|\| so->s_op->o_abandon )
SlapReply rs = { REP_INTERMEDIATE };	break;

rc = syncprov_sendinfo( op, &rs, LDAP_TAG_SYNC_NEW_COOKIE,
&sr->s_csn, 0, NULL, 0 );
} else {
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;
opc.se = sr->s_e;

rc = syncprov_sendresp( op, &opc, so, sr->s_mode );

}	opc.sdn = sr->s_dn;
if ( sr->s_e ) {	opc.sndn = sr->s_ndn;
if ( !dec_mutexint( sr->s_e->e_private )) {	opc.suuid = sr->s_uuid;
sr->s_e->e_private = NULL;	opc.sctxcsn = sr->s_csn;
entry_free ( sr->s_e );	opc.sreference = sr->s_isreference;
	e = NULL;

	if ( sr->s_mode != LDAP_SYNC_DELETE ) {
	rc = overlay_entry_get_ov( op, &opc.sndn, NULL, NULL, 0, &e, on );
	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;
}	}
}	}
	rc = syncprov_sendresp( op, &opc, so, &e, sr->s_mode );

ch_free( sr );	if ( e ) {
	overlay_entry_release_ov( op, e, 0, on );
/* Exit loop with mutex held */	}
ldap_pvt_thread_mutex_lock( &so->s_mutex );

} while (0);

/* We now only send one change at a time, to prevent one	ch_free( sr );
* psearch from hogging all the CPU. Resubmit this task if
* there are more responses queued and no errors occurred.
*/

if ( rc == 0 && so->s_res ) {	if ( rc )
syncprov_qstart( so );	break;
} else {
so->s_flags ^= PS_TASK_QUEUED;
}	}

ldap_pvt_thread_mutex_unlock( &so->s_mutex );
return rc;	return rc;
}	}

/* task for playing back queued responses */	/* runqueue task for playing back queued responses */
static void *	static void *
syncprov_qtask( void ctx, void arg )	syncprov_qtask( void ctx, void arg )
{	{
syncops *so = arg;	struct re_s *rtask = arg;
	syncops *so = rtask->arg;
	slap_overinst *on = so->s_op->o_private;
OperationBuffer opbuf;	OperationBuffer opbuf;
Operation *op;	Operation *op;
BackendDB be;	BackendDB be;
Line 1003 syncprov_qtask( void ctx, void arg )	Line 912 syncprov_qtask( void ctx, void arg )
be = *so->s_op->o_bd;	be = *so->s_op->o_bd;
be.be_flags \|= SLAP_DBFLAG_OVERLAY;	be.be_flags \|= SLAP_DBFLAG_OVERLAY;
op->o_bd = &be;	op->o_bd = &be;
LDAP_SLIST_FIRST(&op->o_extra) = NULL;	op->o_private = NULL;
op->o_callback = NULL;	op->o_callback = NULL;

rc = syncprov_qplay( op, so );	rc = syncprov_qplay( op, on, so );

/* decrement use count... */	/* decrement use count... */
syncprov_free_syncop( so );	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?
	*/
	if ( rc ) {
	ldap_pvt_thread_mutex_lock( &op->o_conn->c_mutex );
	if ( connection_state_closing( op->o_conn )) {
	connection_close( op->o_conn );
	}
	ldap_pvt_thread_mutex_unlock( &op->o_conn->c_mutex );
	}
	#endif
return NULL;	return NULL;
}	}

Line 1018 syncprov_qtask( void ctx, void arg )	Line 949 syncprov_qtask( void ctx, void arg )
static void	static void
syncprov_qstart( syncops *so )	syncprov_qstart( syncops *so )
{	{
so->s_flags \|= PS_TASK_QUEUED;	int wake=0;
so->s_inuse++;	ldap_pvt_thread_mutex_lock( &slapd_rq.rq_mutex );
ldap_pvt_thread_pool_submit( &connection_pool,	if ( !so->s_qtask ) {
syncprov_qtask, so );	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 */	/* Queue a persistent search response */
Line 1029 static int	Line 977 static int
syncprov_qresp( opcookie opc, syncops so, int mode )	syncprov_qresp( opcookie opc, syncops so, int mode )
{	{
syncres *sr;	syncres *sr;
int srsize;	int sid;
struct berval cookie = opc->sctxcsn;

if ( mode == LDAP_SYNC_NEW_COOKIE ) {	/* Don't send changes back to their originator */
syncprov_info_t *si = opc->son->on_bi.bi_private;	sid = slap_parse_csn_sid( &opc->sctxcsn );
	if ( sid >= 0 && sid == so->s_sid )
slap_compose_sync_cookie( NULL, &cookie, si->si_ctxcsn,	return LDAP_SUCCESS;
so->s_rid, slap_serverID ? slap_serverID : -1);
}

srsize = sizeof(syncres) + opc->suuid.bv_len + 1 +	sr = ch_malloc(sizeof(syncres) + opc->suuid.bv_len + 1 +
opc->sdn.bv_len + 1 + opc->sndn.bv_len + 1;	opc->sdn.bv_len + 1 + opc->sndn.bv_len + 1 + opc->sctxcsn.bv_len + 1 );
if ( cookie.bv_len )
srsize += cookie.bv_len + 1;
sr = ch_malloc( srsize );
sr->s_next = NULL;	sr->s_next = NULL;
sr->s_e = opc->se;
/* bump refcount on this entry */
if ( opc->se )
inc_mutexint( opc->se->e_private );
sr->s_dn.bv_val = (char *)(sr + 1);	sr->s_dn.bv_val = (char *)(sr + 1);
sr->s_dn.bv_len = opc->sdn.bv_len;	sr->s_dn.bv_len = opc->sdn.bv_len;
sr->s_mode = mode;	sr->s_mode = mode;
Line 1060 syncprov_qresp( opcookie opc, syncops	Line 998 syncprov_qresp( opcookie opc, syncops
opc->sndn.bv_val ) + 1;	opc->sndn.bv_val ) + 1;
sr->s_uuid.bv_len = opc->suuid.bv_len;	sr->s_uuid.bv_len = opc->suuid.bv_len;
AC_MEMCPY( sr->s_uuid.bv_val, opc->suuid.bv_val, opc->suuid.bv_len );	AC_MEMCPY( sr->s_uuid.bv_val, opc->suuid.bv_val, opc->suuid.bv_len );
if ( cookie.bv_len ) {	sr->s_csn.bv_val = sr->s_uuid.bv_val + sr->s_uuid.bv_len + 1;
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, cookie.bv_val );	strcpy( sr->s_csn.bv_val, opc->sctxcsn.bv_val );
} else {
sr->s_csn.bv_val = NULL;
}
sr->s_csn.bv_len = cookie.bv_len;

if ( mode == LDAP_SYNC_NEW_COOKIE && cookie.bv_val ) {
ch_free( cookie.bv_val );
}

ldap_pvt_thread_mutex_lock( &so->s_mutex );	ldap_pvt_thread_mutex_lock( &so->s_mutex );
if ( !so->s_res ) {	if ( !so->s_res ) {
Line 1085 syncprov_qresp( opcookie opc, syncops	Line 1015 syncprov_qresp( opcookie opc, syncops
so->s_flags ^= PS_WROTE_BASE;	so->s_flags ^= PS_WROTE_BASE;
so->s_flags \|= PS_FIND_BASE;	so->s_flags \|= PS_FIND_BASE;
}	}
if (( so->s_flags & (PS_IS_DETACHED\|PS_TASK_QUEUED)) == PS_IS_DETACHED ) {	if ( so->s_flags & PS_IS_DETACHED ) {
syncprov_qstart( so );	syncprov_qstart( so );
}	}
ldap_pvt_thread_mutex_unlock( &so->s_mutex );	ldap_pvt_thread_mutex_unlock( &so->s_mutex );
Line 1192 syncprov_matchops( Operation *op, opcook	Line 1122 syncprov_matchops( Operation *op, opcook
rc = overlay_entry_get_ov( op, fc.fdn, NULL, NULL, 0, &e, on );	rc = overlay_entry_get_ov( op, fc.fdn, NULL, NULL, 0, &e, on );
/* If we're sending responses now, make a copy and unlock the DB */	/* If we're sending responses now, make a copy and unlock the DB */
if ( e && !saveit ) {	if ( e && !saveit ) {
if ( !opc->se ) {	Entry *e2 = entry_dup( e );
opc->se = entry_dup( e );
opc->se->e_private = get_mutexint();
}
overlay_entry_release_ov( op, e, 0, on );	overlay_entry_release_ov( op, e, 0, on );
e = opc->se;	e = e2;
}	}
if ( rc ) {	if ( rc ) {
op->o_bd = b0;	op->o_bd = b0;
Line 1205 syncprov_matchops( Operation *op, opcook	Line 1132 syncprov_matchops( Operation *op, opcook
}	}
} else {	} else {
e = op->ora_e;	e = op->ora_e;
if ( !saveit ) {
if ( !opc->se ) {
opc->se = entry_dup( e );
opc->se->e_private = get_mutexint();
}
e = opc->se;
}
}	}

if ( saveit \|\| op->o_tag == LDAP_REQ_ADD ) {	if ( saveit \|\| op->o_tag == LDAP_REQ_ADD ) {
Line 1232 syncprov_matchops( Operation *op, opcook	Line 1152 syncprov_matchops( Operation *op, opcook
for (ss = si->si_ops, sprev = (syncops *)&si->si_ops; ss;	for (ss = si->si_ops, sprev = (syncops *)&si->si_ops; ss;
sprev = ss, ss=snext)	sprev = ss, ss=snext)
{	{
Operation op2;
Opheader oh;
syncmatches *sm;	syncmatches *sm;
int found = 0;	int found = 0;

snext = ss->s_next;	snext = ss->s_next;
if ( ss->s_op->o_abandon )
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;
}

/* validate base */	/* validate base */
fc.fss = ss;	fc.fss = ss;
fc.fbase = 0;	fc.fbase = 0;
Line 1272 syncprov_matchops( Operation *op, opcook	Line 1173 syncprov_matchops( Operation *op, opcook
continue;	continue;
}	}


/* If we're sending results now, look for this op in old matches */	/* If we're sending results now, look for this op in old matches */
if ( !saveit ) {	if ( !saveit ) {
syncmatches *old;	syncmatches *old;
Line 1294 syncprov_matchops( Operation *op, opcook	Line 1196 syncprov_matchops( Operation *op, opcook
}	}
}	}

if ( fc.fscope ) {
ldap_pvt_thread_mutex_lock( &ss->s_mutex );
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_bd = op->o_bd->bd_self;
op2.o_hdr = &oh;
op2.o_extra = op->o_extra;
op2.o_callback = NULL;
if (ss->s_flags & PS_FIX_FILTER) {
/* Skip the AND/GE clause that we stuck on in front. We
would lose deletes/mods that happen during the refresh
phase otherwise (ITS#6555) */
op2.ors_filter = ss->s_op->ors_filter->f_and->f_next;
}
ldap_pvt_thread_mutex_unlock( &ss->s_mutex );
rc = test_filter( &op2, e, op2.ors_filter );
}

Debug( LDAP_DEBUG_TRACE, "syncprov_matchops: sid %03x fscope %d rc %d\n",
ss->s_sid, fc.fscope, rc );

/* check if current o_req_dn is in scope and matches filter */	/* check if current o_req_dn is in scope and matches filter */
if ( fc.fscope && rc == LDAP_COMPARE_TRUE ) {	if ( fc.fscope && test_filter( op, e, ss->s_op->ors_filter ) ==
	LDAP_COMPARE_TRUE ) {
if ( saveit ) {	if ( saveit ) {
sm = op->o_tmpalloc( sizeof(syncmatches), op->o_tmpmemctx );	sm = op->o_tmpalloc( sizeof(syncmatches), op->o_tmpmemctx );
sm->sm_next = opc->smatches;	sm->sm_next = opc->smatches;
Line 1335 syncprov_matchops( Operation *op, opcook	Line 1215 syncprov_matchops( Operation *op, opcook
} else if ( !saveit && found ) {	} else if ( !saveit && found ) {
/* send DELETE */	/* send DELETE */
syncprov_qresp( opc, ss, LDAP_SYNC_DELETE );	syncprov_qresp( opc, ss, LDAP_SYNC_DELETE );
} else if ( !saveit ) {
syncprov_qresp( opc, ss, LDAP_SYNC_NEW_COOKIE );
}
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 );	ldap_pvt_thread_mutex_unlock( &si->si_ops_mutex );
Line 1351 syncprov_matchops( Operation *op, opcook	Line 1223 syncprov_matchops( Operation *op, opcook
if ( !SLAP_ISOVERLAY( op->o_bd )) {	if ( !SLAP_ISOVERLAY( op->o_bd )) {
op->o_bd = &db;	op->o_bd = &db;
}	}
if ( saveit )	overlay_entry_release_ov( op, e, 0, on );
overlay_entry_release_ov( op, e, 0, on );
op->o_bd = b0;	op->o_bd = b0;
}	}
if ( opc->se && !saveit ) {
if ( !dec_mutexint( opc->se->e_private )) {
opc->se->e_private = NULL;
entry_free( opc->se );
opc->se = NULL;
}
}
if ( freefdn ) {	if ( freefdn ) {
op->o_tmpfree( fc.fdn->bv_val, op->o_tmpmemctx );	op->o_tmpfree( fc.fdn->bv_val, op->o_tmpmemctx );
}	}
Line 1378 syncprov_op_cleanup( Operation *op, Slap	Line 1242 syncprov_op_cleanup( Operation *op, Slap
syncmatches sm, snext;	syncmatches sm, snext;
modtarget *mt, mtdummy;	modtarget *mt, mtdummy;

ldap_pvt_thread_mutex_lock( &si->si_ops_mutex );
if ( si->si_active )
si->si_active--;
ldap_pvt_thread_mutex_unlock( &si->si_ops_mutex );

for (sm = opc->smatches; sm; sm=snext) {	for (sm = opc->smatches; sm; sm=snext) {
snext = sm->sm_next;	snext = sm->sm_next;
syncprov_free_syncop( sm->sm_op );	syncprov_free_syncop( sm->sm_op );
Line 1390 syncprov_op_cleanup( Operation *op, Slap	Line 1249 syncprov_op_cleanup( Operation *op, Slap
}	}

/* Remove op from lock table */	/* Remove op from lock table */
mt = opc->smt;	mtdummy.mt_op = op;
	ldap_pvt_thread_mutex_lock( &si->si_mods_mutex );
	mt = avl_find( si->si_mods, &mtdummy, sp_avl_cmp );
if ( mt ) {	if ( mt ) {
ldap_pvt_thread_mutex_lock( &mt->mt_mutex );	modinst *mi = mt->mt_mods;
mt->mt_mods = mt->mt_mods->mi_next;
/* If there are more, promote the next one */	/* If there are more, promote the next one */
if ( mt->mt_mods ) {	ldap_pvt_thread_mutex_lock( &mt->mt_mutex );
	if ( mi->mi_next ) {
	mt->mt_mods = mi->mi_next;
mt->mt_op = mt->mt_mods->mi_op;	mt->mt_op = mt->mt_mods->mi_op;
ldap_pvt_thread_mutex_unlock( &mt->mt_mutex );	ldap_pvt_thread_mutex_unlock( &mt->mt_mutex );
} else {	} else {
ldap_pvt_thread_mutex_unlock( &mt->mt_mutex );
ldap_pvt_thread_mutex_lock( &si->si_mods_mutex );
avl_delete( &si->si_mods, mt, sp_avl_cmp );	avl_delete( &si->si_mods, mt, sp_avl_cmp );
ldap_pvt_thread_mutex_unlock( &si->si_mods_mutex );	ldap_pvt_thread_mutex_unlock( &mt->mt_mutex );
ldap_pvt_thread_mutex_destroy( &mt->mt_mutex );	ldap_pvt_thread_mutex_destroy( &mt->mt_mutex );
ch_free( mt );	ch_free( mt );
}	}
}	}
	ldap_pvt_thread_mutex_unlock( &si->si_mods_mutex );
if ( !BER_BVISNULL( &opc->suuid ))	if ( !BER_BVISNULL( &opc->suuid ))
op->o_tmpfree( opc->suuid.bv_val, op->o_tmpmemctx );	op->o_tmpfree( opc->suuid.bv_val, op->o_tmpmemctx );
if ( !BER_BVISNULL( &opc->sndn ))	if ( !BER_BVISNULL( &opc->sndn ))
Line 1427 syncprov_checkpoint( Operation *op, Slap	Line 1289 syncprov_checkpoint( Operation *op, Slap
Operation opm;	Operation opm;
SlapReply rsm = { 0 };	SlapReply rsm = { 0 };
slap_callback cb = {0};	slap_callback cb = {0};
BackendDB be;
BackendInfo *bi;

#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_values = si->si_ctxcsn;
mod.sml_nvalues = NULL;	mod.sml_nvalues = NULL;
mod.sml_desc = slap_schema.si_ad_contextCSN;	mod.sml_desc = slap_schema.si_ad_contextCSN;
mod.sml_op = LDAP_MOD_REPLACE;	mod.sml_op = LDAP_MOD_REPLACE;
mod.sml_flags = SLAP_MOD_INTERNAL;	mod.sml_flags = 0;
mod.sml_next = NULL;	mod.sml_next = NULL;

cb.sc_response = slap_null_cb;	cb.sc_response = slap_null_cb;
Line 1452 syncprov_checkpoint( Operation *op, Slap	Line 1303 syncprov_checkpoint( Operation *op, Slap
opm.o_callback = &cb;	opm.o_callback = &cb;
opm.orm_modlist = &mod;	opm.orm_modlist = &mod;
opm.orm_no_opattrs = 1;	opm.orm_no_opattrs = 1;
if ( SLAP_GLUE_SUBORDINATE( op->o_bd )) {	opm.o_req_dn = op->o_bd->be_suffix[0];
be = *on->on_info->oi_origdb;	opm.o_req_ndn = op->o_bd->be_nsuffix[0];
opm.o_bd = &be;
}
opm.o_req_dn = si->si_contextdn;
opm.o_req_ndn = si->si_contextdn;
bi = opm.o_bd->bd_info;
opm.o_bd->bd_info = on->on_info->oi_orig;	opm.o_bd->bd_info = on->on_info->oi_orig;
opm.o_managedsait = SLAP_CONTROL_NONCRITICAL;	opm.o_managedsait = SLAP_CONTROL_NONCRITICAL;
opm.o_no_schema_check = 1;	opm.o_no_schema_check = 1;
opm.o_bd->be_modify( &opm, &rsm );	opm.o_bd->be_modify( &opm, &rsm );

if ( rsm.sr_err == LDAP_NO_SUCH_OBJECT &&
SLAP_SYNC_SUBENTRY( opm.o_bd )) {
const char *text;
char txtbuf[SLAP_TEXT_BUFLEN];
size_t textlen = sizeof txtbuf;
Entry *e = slap_create_context_csn_entry( opm.o_bd, NULL );
slap_mods2entry( &mod, &e, 0, 1, &text, txtbuf, textlen);
opm.ora_e = e;
opm.o_bd->be_add( &opm, &rsm );
if ( e == opm.ora_e )
be_entry_release_w( &opm, opm.ora_e );
}
opm.o_bd->bd_info = bi;

if ( mod.sml_next != NULL ) {	if ( mod.sml_next != NULL ) {
slap_mods_free( mod.sml_next, 1 );	slap_mods_free( mod.sml_next, 1 );
}	}
#ifdef CHECK_CSN	opm.orm_no_opattrs = 0;
for ( i=0; i<si->si_numcsns; i++ ) {
assert( !syn->ssyn_validate( syn, si->si_ctxcsn+i ));
}
#endif
}	}

static void	static void
Line 1499 syncprov_add_slog( Operation *op )	Line 1326 syncprov_add_slog( Operation *op )

sl = si->si_logs;	sl = si->si_logs;
{	{
if ( BER_BVISEMPTY( &op->o_csn ) ) {
/* During the syncrepl refresh phase we can receive operations
* without a csn. We cannot reliably determine the consumers
* state with respect to such operations, so we ignore them and
* wipe out anything in the log if we see them.
*/
ldap_pvt_thread_mutex_lock( &sl->sl_mutex );
while ( se = sl->sl_head ) {
sl->sl_head = se->se_next;
ch_free( se );
}
sl->sl_tail = NULL;
sl->sl_num = 0;
ldap_pvt_thread_mutex_unlock( &sl->sl_mutex );
return;
}

/* Allocate a record. UUIDs are not NUL-terminated. */	/* Allocate a record. UUIDs are not NUL-terminated. */
se = ch_malloc( sizeof( slog_entry ) + opc->suuid.bv_len +	se = ch_malloc( sizeof( slog_entry ) + opc->suuid.bv_len +
op->o_csn.bv_len + 1 );	op->o_csn.bv_len + 1 );
Line 1534 syncprov_add_slog( Operation *op )	Line 1344 syncprov_add_slog( Operation *op )

ldap_pvt_thread_mutex_lock( &sl->sl_mutex );	ldap_pvt_thread_mutex_lock( &sl->sl_mutex );
if ( sl->sl_head ) {	if ( sl->sl_head ) {
/* Keep the list in csn order. */	sl->sl_tail->se_next = se;
if ( ber_bvcmp( &sl->sl_tail->se_csn, &se->se_csn ) <= 0 ) {
sl->sl_tail->se_next = se;
sl->sl_tail = se;
} else {
slog_entry **sep;

for ( sep = &sl->sl_head; sep; sep = &(sep)->se_next ) {
if ( ber_bvcmp( &se->se_csn, &(*sep)->se_csn ) < 0 ) {
se->se_next = *sep;
*sep = se;
break;
}
}
}
} else {	} else {
sl->sl_head = se;	sl->sl_head = se;
sl->sl_tail = se;
}	}
	sl->sl_tail = se;
sl->sl_num++;	sl->sl_num++;
while ( sl->sl_num > sl->sl_size ) {	while ( sl->sl_num > sl->sl_size ) {
se = sl->sl_head;	se = sl->sl_head;
sl->sl_head = se->se_next;	sl->sl_head = se->se_next;
	strcpy( sl->sl_mincsn.bv_val, se->se_csn.bv_val );
	sl->sl_mincsn.bv_len = se->se_csn.bv_len;
ch_free( se );	ch_free( se );
sl->sl_num--;	sl->sl_num--;
}	}
Line 1582 syncprov_playlog( Operation *op, SlapRep	Line 1380 syncprov_playlog( Operation *op, SlapRep
slap_overinst on = (slap_overinst )op->o_bd->bd_info;	slap_overinst on = (slap_overinst )op->o_bd->bd_info;
slog_entry *se;	slog_entry *se;
int i, j, ndel, num, nmods, mmods;	int i, j, ndel, num, nmods, mmods;
char cbuf[LDAP_PVT_CSNSTR_BUFSIZE];	char cbuf[LDAP_LUTIL_CSNSTR_BUFSIZE];
BerVarray uuids;	BerVarray uuids;
struct berval delcsn[2];	struct berval delcsn[2];

Line 1684 syncprov_playlog( Operation *op, SlapRep	Line 1482 syncprov_playlog( Operation *op, SlapRep
SlapReply frs = { REP_RESULT };	SlapReply frs = { REP_RESULT };
int rc;	int rc;
Filter mf, af;	Filter mf, af;
AttributeAssertion eq = ATTRIBUTEASSERTION_INIT;	#ifdef LDAP_COMP_MATCH
	AttributeAssertion eq = { NULL, BER_BVNULL, NULL };
	#else
	AttributeAssertion eq;
	#endif
slap_callback cb = {0};	slap_callback cb = {0};

fop = *op;	fop = *op;
Line 1708 syncprov_playlog( Operation *op, SlapRep	Line 1510 syncprov_playlog( Operation *op, SlapRep
fop.ors_filter = ⁡	fop.ors_filter = ⁡

cb.sc_response = playlog_cb;	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++ ) {	for ( i=ndel; i<num; i++ ) {
if ( uuids[i].bv_len == 0 ) continue;	if ( uuids[i].bv_len == 0 ) continue;
Line 1729 syncprov_playlog( Operation *op, SlapRep	Line 1531 syncprov_playlog( Operation *op, SlapRep
if ( ndel ) {	if ( ndel ) {
struct berval cookie;	struct berval cookie;

if ( delcsn[0].bv_len ) {	slap_compose_sync_cookie( op, &cookie, delcsn, srs->sr_state.rid,
slap_compose_sync_cookie( op, &cookie, delcsn, srs->sr_state.rid,	srs->sr_state.sid );
slap_serverID ? slap_serverID : -1 );

Debug( LDAP_DEBUG_SYNC, "syncprov_playlog: cookie=%s\n", cookie.bv_val, 0, 0 );
}

uuids[ndel].bv_val = NULL;	uuids[ndel].bv_val = NULL;
syncprov_sendinfo( op, rs, LDAP_TAG_SYNC_ID_SET,	syncprov_sendinfo( op, rs, LDAP_TAG_SYNC_ID_SET, &cookie, 0, uuids, 1 );
delcsn[0].bv_len ? &cookie : NULL, 0, uuids, 1 );	op->o_tmpfree( cookie.bv_val, op->o_tmpmemctx );
if ( delcsn[0].bv_len ) {
op->o_tmpfree( cookie.bv_val, op->o_tmpmemctx );
}
}	}
op->o_tmpfree( uuids, op->o_tmpmemctx );	op->o_tmpfree( uuids, op->o_tmpmemctx );
}	}
Line 1756 syncprov_op_response( Operation *op, Sla	Line 1550 syncprov_op_response( Operation *op, Sla

if ( rs->sr_err == LDAP_SUCCESS )	if ( rs->sr_err == LDAP_SUCCESS )
{	{
struct berval maxcsn;	struct berval maxcsn = BER_BVNULL;
char cbuf[LDAP_PVT_CSNSTR_BUFSIZE];	char cbuf[LDAP_LUTIL_CSNSTR_BUFSIZE];
int do_check = 0, have_psearches, foundit, csn_changed = 0;	int do_check = 0;

ldap_pvt_thread_mutex_lock( &si->si_resp_mutex );

/* Update our context CSN */	/* Update our context CSN */
cbuf[0] = '\0';	cbuf[0] = '\0';
maxcsn.bv_val = cbuf;
maxcsn.bv_len = sizeof(cbuf);
ldap_pvt_thread_rdwr_wlock( &si->si_csn_rwlock );	ldap_pvt_thread_rdwr_wlock( &si->si_csn_rwlock );
	slap_get_commit_csn( op, &maxcsn );
slap_get_commit_csn( op, &maxcsn, &foundit );	if ( !BER_BVISNULL( &maxcsn ) ) {
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 ) ) {
int i, sid;	int i, sid;
#ifdef CHECK_CSN	strcpy( cbuf, maxcsn.bv_val );
Syntax *syn = slap_schema.si_ad_contextCSN->ad_type->sat_syntax;
assert( !syn->ssyn_validate( syn, &maxcsn ));
#endif
sid = slap_parse_csn_sid( &maxcsn );	sid = slap_parse_csn_sid( &maxcsn );
for ( i=0; i<si->si_numcsns; i++ ) {	for ( i=0; i<si->si_numcsns; i++ ) {
if ( sid == si->si_sids[i] ) {	if ( sid == si->si_sids[i] ) {
if ( ber_bvcmp( &maxcsn, &si->si_ctxcsn[i] ) > 0 ) {	if ( ber_bvcmp( &maxcsn, &si->si_ctxcsn[i] ) > 0 ) {
ber_bvreplace( &si->si_ctxcsn[i], &maxcsn );	ber_bvreplace( &si->si_ctxcsn[i], &maxcsn );
csn_changed = 1;
}	}
break;	break;
}	}
Line 1801 syncprov_op_response( Operation *op, Sla	Line 1573 syncprov_op_response( Operation *op, Sla
/* It's a new SID for us */	/* It's a new SID for us */
if ( i == si->si_numcsns ) {	if ( i == si->si_numcsns ) {
value_add_one( &si->si_ctxcsn, &maxcsn );	value_add_one( &si->si_ctxcsn, &maxcsn );
csn_changed = 1;
si->si_numcsns++;	si->si_numcsns++;
si->si_sids = ch_realloc( si->si_sids, si->si_numcsns *	si->si_sids = ch_realloc( si->si_sids, si->si_numcsns *
sizeof(int));	sizeof(int));
Line 1810 syncprov_op_response( Operation *op, Sla	Line 1581 syncprov_op_response( Operation *op, Sla
}	}

/* Don't do any processing for consumer contextCSN updates */	/* Don't do any processing for consumer contextCSN updates */
if ( op->o_dont_replicate ) {	if ( SLAP_SYNC_SHADOW( op->o_bd ) &&
if ( op->o_tag == LDAP_REQ_MODIFY &&	op->o_msgid == SLAP_SYNC_UPDATE_MSGID ) {
op->orm_modlist->sml_op == LDAP_MOD_REPLACE &&
op->orm_modlist->sml_desc == slap_schema.si_ad_contextCSN ) {
/* Catch contextCSN updates from syncrepl. We have to look at
* all the attribute values, as there may be more than one csn
* that changed, and only one can be passed in the csn queue.
*/
Modifications *mod = op->orm_modlist;
int i, j, sid;

for ( i=0; i<mod->sml_numvals; i++ ) {
sid = slap_parse_csn_sid( &mod->sml_values[i] );
for ( j=0; j<si->si_numcsns; j++ ) {
if ( sid == si->si_sids[j] ) {
if ( ber_bvcmp( &mod->sml_values[i], &si->si_ctxcsn[j] ) > 0 ) {
ber_bvreplace( &si->si_ctxcsn[j], &mod->sml_values[i] );
csn_changed = 1;
}
break;
}
}

if ( j == si->si_numcsns ) {
value_add_one( &si->si_ctxcsn, &mod->sml_values[i] );
si->si_numcsns++;
si->si_sids = ch_realloc( si->si_sids, si->si_numcsns *
sizeof(int));
si->si_sids[j] = sid;
csn_changed = 1;
}
}
if ( csn_changed )
si->si_dirty = 0;
ldap_pvt_thread_rdwr_wunlock( &si->si_csn_rwlock );	ldap_pvt_thread_rdwr_wunlock( &si->si_csn_rwlock );
	return SLAP_CB_CONTINUE;
if ( csn_changed ) {
syncops *ss;
ldap_pvt_thread_mutex_lock( &si->si_ops_mutex );
for ( ss = si->si_ops; ss; ss = ss->s_next ) {
if ( ss->s_op->o_abandon )
continue;
/* Send the updated csn to all syncrepl consumers,
* including the server from which it originated.
* The syncrepl consumer and syncprov provider on
* the originating server may be configured to store
* their csn values in different entries.
*/
syncprov_qresp( opc, ss, LDAP_SYNC_NEW_COOKIE );
}
ldap_pvt_thread_mutex_unlock( &si->si_ops_mutex );
}
} else {
ldap_pvt_thread_rdwr_wunlock( &si->si_csn_rwlock );
}
goto leave;
}	}

si->si_numops++;	si->si_numops++;
if ( si->si_chkops \|\| si->si_chktime ) {	if ( si->si_chkops \|\| si->si_chktime ) {
/* Never checkpoint adding the context entry,	if ( si->si_chkops && si->si_numops >= si->si_chkops ) {
* it will deadlock	do_check = 1;
*/	si->si_numops = 0;
if ( op->o_tag != LDAP_REQ_ADD \|\|	}
!dn_match( &op->o_req_ndn, &si->si_contextdn )) {	if ( si->si_chktime &&
if ( si->si_chkops && si->si_numops >= si->si_chkops ) {	(op->o_time - si->si_chklast >= si->si_chktime )) {
do_check = 1;	do_check = 1;
si->si_numops = 0;	si->si_chklast = op->o_time;
}
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;
}
}
}	}
}	}
si->si_dirty = !csn_changed;
ldap_pvt_thread_rdwr_wunlock( &si->si_csn_rwlock );	ldap_pvt_thread_rdwr_wunlock( &si->si_csn_rwlock );

if ( do_check ) {	if ( do_check ) {
Line 1899 syncprov_op_response( Operation *op, Sla	Line 1607 syncprov_op_response( Operation *op, Sla
ldap_pvt_thread_rdwr_runlock( &si->si_csn_rwlock );	ldap_pvt_thread_rdwr_runlock( &si->si_csn_rwlock );
}	}

/* only update consumer ctx if this is a newer csn */	opc->sctxcsn.bv_len = maxcsn.bv_len;
if ( csn_changed ) {	opc->sctxcsn.bv_val = cbuf;
opc->sctxcsn = maxcsn;
}

/* Handle any persistent searches */	/* Handle any persistent searches */
ldap_pvt_thread_mutex_lock( &si->si_ops_mutex );	if ( si->si_ops ) {
have_psearches = ( si->si_ops != NULL );
ldap_pvt_thread_mutex_unlock( &si->si_ops_mutex );
if ( have_psearches ) {
switch(op->o_tag) {	switch(op->o_tag) {
case LDAP_REQ_ADD:	case LDAP_REQ_ADD:
case LDAP_REQ_MODIFY:	case LDAP_REQ_MODIFY:
Line 1933 syncprov_op_response( Operation *op, Sla	Line 1636 syncprov_op_response( Operation *op, Sla
if ( si->si_logs && op->o_tag != LDAP_REQ_ADD ) {	if ( si->si_logs && op->o_tag != LDAP_REQ_ADD ) {
syncprov_add_slog( op );	syncprov_add_slog( op );
}	}
leave: ldap_pvt_thread_mutex_unlock( &si->si_resp_mutex );
}	}
return SLAP_CB_CONTINUE;	return SLAP_CB_CONTINUE;
}	}
Line 1949 syncprov_op_compare( Operation *op, Slap	Line 1652 syncprov_op_compare( Operation *op, Slap
syncprov_info_t *si = on->on_bi.bi_private;	syncprov_info_t *si = on->on_bi.bi_private;
int rc = SLAP_CB_CONTINUE;	int rc = SLAP_CB_CONTINUE;

if ( dn_match( &op->o_req_ndn, &si->si_contextdn ) &&	if ( dn_match( &op->o_req_ndn, op->o_bd->be_nsuffix ) &&
op->oq_compare.rs_ava->aa_desc == slap_schema.si_ad_contextCSN )	op->oq_compare.rs_ava->aa_desc == slap_schema.si_ad_contextCSN )
{	{
Entry e = {0};	Entry e = {0};
Attribute a = {0};	Attribute a = {0};

e.e_name = si->si_contextdn;	e.e_name = op->o_bd->be_suffix[0];
e.e_nname = si->si_contextdn;	e.e_nname = op->o_bd->be_nsuffix[0];
e.e_attrs = &a;	e.e_attrs = &a;

a.a_desc = slap_schema.si_ad_contextCSN;	a.a_desc = slap_schema.si_ad_contextCSN;
Line 1965 syncprov_op_compare( Operation *op, Slap	Line 1668 syncprov_op_compare( Operation *op, Slap

a.a_vals = si->si_ctxcsn;	a.a_vals = si->si_ctxcsn;
a.a_nvals = a.a_vals;	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,	rs->sr_err = access_allowed( op, &e, op->oq_compare.rs_ava->aa_desc,
&op->oq_compare.rs_ava->aa_value, ACL_COMPARE, NULL );	&op->oq_compare.rs_ava->aa_value, ACL_COMPARE, NULL );
Line 1984 syncprov_op_compare( Operation *op, Slap	Line 1686 syncprov_op_compare( Operation *op, Slap

rs->sr_err = LDAP_COMPARE_FALSE;	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_ATTRIBUTE_VALUE_NORMALIZED_MATCH \|
SLAP_MR_ASSERTED_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;	rs->sr_err = LDAP_COMPARE_TRUE;
}	}
Line 2012 syncprov_op_mod( Operation *op, SlapRepl	Line 1714 syncprov_op_mod( Operation *op, SlapRepl
{	{
slap_overinst on = (slap_overinst )op->o_bd->bd_info;	slap_overinst on = (slap_overinst )op->o_bd->bd_info;
syncprov_info_t *si = on->on_bi.bi_private;	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 );
si->si_active++;
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);	slap_callback *cb = op->o_tmpcalloc(1, sizeof(slap_callback)+
opc = (opcookie *)(cb+1);	sizeof(opcookie) +
	(si->si_ops ? sizeof(modinst) : 0 ),
	op->o_tmpmemctx);
	opcookie opc = (opcookie )(cb+1);
opc->son = on;	opc->son = on;
cb->sc_response = syncprov_op_response;	cb->sc_response = syncprov_op_response;
cb->sc_cleanup = syncprov_op_cleanup;	cb->sc_cleanup = syncprov_op_cleanup;
Line 2033 syncprov_op_mod( Operation *op, SlapRepl	Line 1727 syncprov_op_mod( Operation *op, SlapRepl
cb->sc_next = op->o_callback;	cb->sc_next = op->o_callback;
op->o_callback = cb;	op->o_callback = cb;

opc->osid = -1;
opc->rsid = -1;
if ( op->o_csn.bv_val ) {
opc->osid = slap_parse_csn_sid( &op->o_csn );
}
if ( op->o_controls ) {
struct sync_cookie *scook =
op->o_controls[slap_cids.sc_LDAPsync];
if ( scook )
opc->rsid = scook->sid;
}

/* If there are active persistent searches, lock this operation.	/* If there are active persistent searches, lock this operation.
* See seqmod.c for the locking logic on its own.	* See seqmod.c for the locking logic on its own.
*/	*/
if ( have_psearches ) {	if ( si->si_ops ) {
modtarget *mt, mtdummy;	modtarget *mt, mtdummy;
modinst *mi;	modinst *mi;

Line 2061 syncprov_op_mod( Operation *op, SlapRepl	Line 1743 syncprov_op_mod( Operation *op, SlapRepl
mt = avl_find( si->si_mods, &mtdummy, sp_avl_cmp );	mt = avl_find( si->si_mods, &mtdummy, sp_avl_cmp );
if ( mt ) {	if ( mt ) {
ldap_pvt_thread_mutex_lock( &mt->mt_mutex );	ldap_pvt_thread_mutex_lock( &mt->mt_mutex );
if ( mt->mt_mods == NULL ) {
/* Cannot reuse this mt, as another thread is about
* to release it in syncprov_op_cleanup.
*/
ldap_pvt_thread_mutex_unlock( &mt->mt_mutex );
mt = NULL;
}
}
if ( mt ) {
ldap_pvt_thread_mutex_unlock( &si->si_mods_mutex );	ldap_pvt_thread_mutex_unlock( &si->si_mods_mutex );
mt->mt_tail->mi_next = mi;	mt->mt_tail->mi_next = mi;
mt->mt_tail = mi;	mt->mt_tail = mi;
/* wait for this op to get to head of list */	/* wait for this op to get to head of list */
while ( mt->mt_mods != mi ) {	while ( mt->mt_mods != mi ) {
ldap_pvt_thread_mutex_unlock( &mt->mt_mutex );	ldap_pvt_thread_mutex_unlock( &mt->mt_mutex );
/* FIXME: if dynamic config can delete overlays or	ldap_pvt_thread_yield();
* databases we'll have to check for cleanup here.
* Currently it's not an issue because there are
* no dynamic config deletes...
*/
if ( slapd_shutdown )
return SLAPD_ABANDON;

if ( !ldap_pvt_thread_pool_pausecheck( &connection_pool ))
ldap_pvt_thread_yield();
ldap_pvt_thread_mutex_lock( &mt->mt_mutex );	ldap_pvt_thread_mutex_lock( &mt->mt_mutex );

/* clean up if the caller is giving up */	/* clean up if the caller is giving up */
Line 2111 syncprov_op_mod( Operation *op, SlapRepl	Line 1775 syncprov_op_mod( Operation *op, SlapRepl
avl_insert( &si->si_mods, mt, sp_avl_cmp, avl_dup_error );	avl_insert( &si->si_mods, mt, sp_avl_cmp, avl_dup_error );
ldap_pvt_thread_mutex_unlock( &si->si_mods_mutex );	ldap_pvt_thread_mutex_unlock( &si->si_mods_mutex );
}	}
opc->smt = mt;
}	}

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 );	syncprov_matchops( op, opc, 1 );

return SLAP_CB_CONTINUE;	return SLAP_CB_CONTINUE;
Line 2135 typedef struct searchstate {	Line 1798 typedef struct searchstate {
BerVarray ss_ctxcsn;	BerVarray ss_ctxcsn;
int *ss_sids;	int *ss_sids;
int ss_numcsns;	int ss_numcsns;
#define SS_PRESENT 0x01	int ss_present;
#define SS_CHANGED 0x02
int ss_flags;
} searchstate;	} searchstate;

static int	static int
Line 2154 syncprov_search_cleanup( Operation *op,	Line 1815 syncprov_search_cleanup( Operation *op,
typedef struct SyncOperationBuffer {	typedef struct SyncOperationBuffer {
Operation sob_op;	Operation sob_op;
Opheader sob_hdr;	Opheader sob_hdr;
OpExtra sob_oe;
AttributeName sob_extra; /* not always present */	AttributeName sob_extra; /* not always present */
/* Further data allocated here */	/* Further data allocated here */
} SyncOperationBuffer;	} SyncOperationBuffer;
Line 2183 syncprov_detach_op( Operation *op, synco	Line 1843 syncprov_detach_op( Operation *op, synco
sopbuf2 = ch_calloc( 1, size );	sopbuf2 = ch_calloc( 1, size );
op2 = &sopbuf2->sob_op;	op2 = &sopbuf2->sob_op;
op2->o_hdr = &sopbuf2->sob_hdr;	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 */	/* Copy the fields we care about explicitly, leave the rest alone */
op2->o_hdr = op->o_hdr;	op2->o_hdr = op->o_hdr;
Line 2191 syncprov_detach_op( Operation *op, synco	Line 1850 syncprov_detach_op( Operation *op, synco
op2->o_time = op->o_time;	op2->o_time = op->o_time;
op2->o_bd = on->on_info->oi_origdb;	op2->o_bd = on->on_info->oi_origdb;
op2->o_request = op->o_request;	op2->o_request = op->o_request;
op2->o_managedsait = op->o_managedsait;	op2->o_private = on;
LDAP_SLIST_FIRST(&op2->o_extra)->oe_key = on;
LDAP_SLIST_NEXT(LDAP_SLIST_FIRST(&op2->o_extra), oe_next) = NULL;

ptr = (char *) sopbuf2 + offsetof( SyncOperationBuffer, sob_extra );	ptr = (char *) sopbuf2 + offsetof( SyncOperationBuffer, sob_extra );
if ( i ) {	if ( i ) {
Line 2244 syncprov_detach_op( Operation *op, synco	Line 1901 syncprov_detach_op( Operation *op, synco
op2->o_do_not_cache = 1;	op2->o_do_not_cache = 1;

/* Add op2 to conn so abandon will find us */	/* 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_executing++;
op->o_conn->c_n_ops_completed--;	op->o_conn->c_n_ops_completed--;
LDAP_STAILQ_INSERT_TAIL( &op->o_conn->c_ops, op2, o_next );	LDAP_STAILQ_INSERT_TAIL( &op->o_conn->c_ops, op2, o_next );
so->s_flags \|= PS_IS_DETACHED;	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 */	/* Prevent anyone else from trying to send a result for this op */
op->o_abandon = 1;	op->o_abandon = 1;
Line 2258 syncprov_search_response( Operation *op,	Line 1917 syncprov_search_response( Operation *op,
{	{
searchstate *ss = op->o_callback->sc_private;	searchstate *ss = op->o_callback->sc_private;
slap_overinst *on = ss->ss_on;	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];	sync_control *srs = op->o_controls[slap_cids.sc_LDAPsync];

if ( rs->sr_type == REP_SEARCH \|\| rs->sr_type == REP_SEARCHREF ) {	if ( rs->sr_type == REP_SEARCH \|\| rs->sr_type == REP_SEARCHREF ) {
Line 2288 syncprov_search_response( Operation *op,	Line 1946 syncprov_search_response( Operation *op,
rs->sr_entry->e_name.bv_val, 0, 0 );	rs->sr_entry->e_name.bv_val, 0, 0 );
return LDAP_SUCCESS;	return LDAP_SUCCESS;
}	}
	/* Make sure entry is less than the snapshot'd contextCSN */
/* If not a persistent search */	for ( i=0; i<ss->ss_numcsns; i++ ) {
if ( !ss->ss_so ) {	if ( sid == ss->ss_sids[i] && ber_bvcmp( &a->a_nvals[0],
/* Make sure entry is less than the snapshot'd contextCSN */	&ss->ss_ctxcsn[i] ) > 0 ) {
for ( i=0; i<ss->ss_numcsns; i++ ) {	Debug( LDAP_DEBUG_SYNC,
if ( sid == ss->ss_sids[i] && ber_bvcmp( &a->a_nvals[0],	"Entry %s CSN %s greater than snapshot %s\n",
&ss->ss_ctxcsn[i] ) > 0 ) {	rs->sr_entry->e_name.bv_val,
Debug( LDAP_DEBUG_SYNC,	a->a_nvals[0].bv_val,
"Entry %s CSN %s greater than snapshot %s\n",	ss->ss_ctxcsn[i].bv_val );
rs->sr_entry->e_name.bv_val,	return LDAP_SUCCESS;
a->a_nvals[0].bv_val,
ss->ss_ctxcsn[i].bv_val );
return LDAP_SUCCESS;
}
}	}
}	}

Line 2324 syncprov_search_response( Operation *op,	Line 1978 syncprov_search_response( Operation *op,
rs->sr_ctrls = op->o_tmpalloc( sizeof(LDAPControl )2,	rs->sr_ctrls = op->o_tmpalloc( sizeof(LDAPControl )2,
op->o_tmpmemctx );	op->o_tmpmemctx );
rs->sr_ctrls[1] = NULL;	rs->sr_ctrls[1] = NULL;
/* If we're in delta-sync mode, always send a cookie */	rs->sr_err = syncprov_state_ctrl( op, rs, rs->sr_entry,
if ( si->si_nopres && si->si_usehint && a ) {	LDAP_SYNC_ADD, rs->sr_ctrls, 0, 0, NULL );
struct berval cookie;
slap_compose_sync_cookie( op, &cookie, a->a_nvals, srs->sr_state.rid, slap_serverID ? slap_serverID : -1 );
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 );
}
} else if ( rs->sr_type == REP_RESULT && rs->sr_err == LDAP_SUCCESS ) {	} else if ( rs->sr_type == REP_RESULT && rs->sr_err == LDAP_SUCCESS ) {
struct berval cookie = BER_BVNULL;	struct berval cookie;

if ( ( ss->ss_flags & SS_CHANGED ) &&
ss->ss_ctxcsn && !BER_BVISNULL( &ss->ss_ctxcsn[0] )) {
slap_compose_sync_cookie( op, &cookie, ss->ss_ctxcsn,
srs->sr_state.rid, slap_serverID ? slap_serverID : -1 );

Debug( LDAP_DEBUG_SYNC, "syncprov_search_response: cookie=%s\n", cookie.bv_val, 0, 0 );	slap_compose_sync_cookie( op, &cookie, ss->ss_ctxcsn,
}	srs->sr_state.rid, srs->sr_state.sid );

/* Is this a regular refresh?	/* Is this a regular refresh? */
* Note: refresh never gets here if there were no changes
*/
if ( !ss->ss_so ) {	if ( !ss->ss_so ) {
rs->sr_ctrls = op->o_tmpalloc( sizeof(LDAPControl )2,	rs->sr_ctrls = op->o_tmpalloc( sizeof(LDAPControl )2,
op->o_tmpmemctx );	op->o_tmpmemctx );
rs->sr_ctrls[1] = NULL;	rs->sr_ctrls[1] = NULL;
rs->sr_err = syncprov_done_ctrl( op, rs, rs->sr_ctrls,	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 );	LDAP_SYNC_REFRESH_DELETES );
op->o_tmpfree( cookie.bv_val, op->o_tmpmemctx );	op->o_tmpfree( cookie.bv_val, op->o_tmpmemctx );
} else {	} else {
/* It's RefreshAndPersist, transition to Persist phase */	/* 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,	LDAP_TAG_SYNC_REFRESH_PRESENT : LDAP_TAG_SYNC_REFRESH_DELETE,
( ss->ss_flags & SS_CHANGED ) ? &cookie : NULL,	&cookie, 1, NULL, 0 );
1, NULL, 0 );	op->o_tmpfree( cookie.bv_val, op->o_tmpmemctx );
if ( !BER_BVISNULL( &cookie ))
op->o_tmpfree( cookie.bv_val, op->o_tmpmemctx );

/* Detach this Op from frontend control */	/* 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 */	/* Turn off the refreshing flag */
if ( op->o_abandon ) {	ss->ss_so->s_flags ^= PS_IS_REFRESHING;
ldap_pvt_thread_mutex_unlock( &op->o_conn->c_mutex );
/* syncprov_ab_cleanup will free this syncop */
return SLAPD_ABANDON;

} else {	syncprov_detach_op( op, ss->ss_so, on );
ldap_pvt_thread_mutex_lock( &ss->ss_so->s_mutex );
/* Turn off the refreshing flag */	/* If there are queued responses, fire them off */
ss->ss_so->s_flags ^= PS_IS_REFRESHING;	if ( ss->ss_so->s_res )
	syncprov_qstart( ss->ss_so );
syncprov_detach_op( op, ss->ss_so, on );	ldap_pvt_thread_mutex_unlock( &ss->ss_so->s_mutex );

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 );
}

return LDAP_SUCCESS;	return LDAP_SUCCESS;
}	}
Line 2402 syncprov_op_search( Operation *op, SlapR	Line 2028 syncprov_op_search( Operation *op, SlapR
slap_overinst on = (slap_overinst )op->o_bd->bd_info;	slap_overinst on = (slap_overinst )op->o_bd->bd_info;
syncprov_info_t si = (syncprov_info_t )on->on_bi.bi_private;	syncprov_info_t si = (syncprov_info_t )on->on_bi.bi_private;
slap_callback *cb;	slap_callback *cb;
int gotstate = 0, changed = 0, do_present = 0;	int gotstate = 0, nochange = 0, do_present;
syncops *sop = NULL;	syncops *sop = NULL;
searchstate *ss;	searchstate *ss;
sync_control *srs;	sync_control *srs;
BerVarray ctxcsn;	BerVarray ctxcsn;
int i, *sids, numcsns;	int i, *sids, numcsns;
struct berval mincsn;	struct berval mincsn;
int dirty = 0;

if ( !(op->o_sync_mode & SLAP_SYNC_REFRESH) ) return SLAP_CB_CONTINUE;	if ( !(op->o_sync_mode & SLAP_SYNC_REFRESH) ) return SLAP_CB_CONTINUE;

Line 2418 syncprov_op_search( Operation *op, SlapR	Line 2043 syncprov_op_search( Operation *op, SlapR
return rs->sr_err;	return rs->sr_err;
}	}

	do_present = si->si_nopres ? 0 : 1;

srs = op->o_controls[slap_cids.sc_LDAPsync];	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 this is a persistent search, set it up right away */
if ( op->o_sync_mode & SLAP_SYNC_PERSIST ) {	if ( op->o_sync_mode & SLAP_SYNC_PERSIST ) {
Line 2454 syncprov_op_search( Operation *op, SlapR	Line 2082 syncprov_op_search( Operation *op, SlapR
sop->s_inuse = 1;	sop->s_inuse = 1;

ldap_pvt_thread_mutex_lock( &si->si_ops_mutex );	ldap_pvt_thread_mutex_lock( &si->si_ops_mutex );
while ( si->si_active ) {
/* Wait for active mods to finish before proceeding, as they
* may already have inspected the si_ops list looking for
* consumers to replicate the change to. Using the log
* doesn't help, as we may finish playing it before the
* active mods gets added to it.
*/
ldap_pvt_thread_mutex_unlock( &si->si_ops_mutex );
if ( slapd_shutdown )
return SLAPD_ABANDON;
if ( !ldap_pvt_thread_pool_pausecheck( &connection_pool ))
ldap_pvt_thread_yield();
ldap_pvt_thread_mutex_lock( &si->si_ops_mutex );
}
sop->s_next = si->si_ops;	sop->s_next = si->si_ops;
si->si_ops = sop;	si->si_ops = sop;
ldap_pvt_thread_mutex_unlock( &si->si_ops_mutex );	ldap_pvt_thread_mutex_unlock( &si->si_ops_mutex );
Line 2485 syncprov_op_search( Operation *op, SlapR	Line 2099 syncprov_op_search( Operation *op, SlapR
ctxcsn = NULL;	ctxcsn = NULL;
sids = NULL;	sids = NULL;
}	}
dirty = si->si_dirty;
ldap_pvt_thread_rdwr_runlock( &si->si_csn_rwlock );	ldap_pvt_thread_rdwr_runlock( &si->si_csn_rwlock );

/* If we have a cookie, handle the PRESENT lookups */	/* If we have a cookie, handle the PRESENT lookups */
Line 2499 syncprov_op_search( Operation *op, SlapR	Line 2112 syncprov_op_search( Operation *op, SlapR
if ( !numcsns )	if ( !numcsns )
goto no_change;	goto no_change;

if ( !si->si_nopres )
do_present = SS_PRESENT;

/* If there are SIDs we don't recognize in the cookie, drop them */	/* If there are SIDs we don't recognize in the cookie, drop them */
for (i=0; i<srs->sr_state.numcsns; ) {	for (i=0; i<srs->sr_state.numcsns; ) {
for (j=0; j<numcsns; j++) {	for (j=0; j<numcsns; j++) {
Line 2532 syncprov_op_search( Operation *op, SlapR	Line 2142 syncprov_op_search( Operation *op, SlapR

/* If nothing has changed, shortcut it */	/* If nothing has changed, shortcut it */
if ( srs->sr_state.numcsns == numcsns ) {	if ( srs->sr_state.numcsns == numcsns ) {
int i, j, newer;	int i, j, changed = 0;
for ( i=0; i<srs->sr_state.numcsns; i++ ) {	for ( i=0; i<srs->sr_state.numcsns; i++ ) {
for ( j=0; j<numcsns; j++ ) {	for ( j=0; j<numcsns; j++ ) {
if ( srs->sr_state.sids[i] != sids[j] )	if ( srs->sr_state.sids[i] != sids[j] )
continue;	continue;
newer = ber_bvcmp( &srs->sr_state.ctxcsn[i], &ctxcsn[j] );	if ( !bvmatch( &srs->sr_state.ctxcsn[i], &ctxcsn[j] ))
/* If our state is newer, tell consumer about changes */	changed = 1;
if ( newer < 0 )
changed = SS_CHANGED;
else if ( newer > 0 ) {
/* our state is older, complain to consumer */
rs->sr_err = LDAP_UNWILLING_TO_PERFORM;
rs->sr_text = "consumer state is newer than provider!";
bailout:
if ( sop ) {
syncops **sp = &si->si_ops;

ldap_pvt_thread_mutex_lock( &si->si_ops_mutex );
while ( *sp != sop )
sp = &(*sp)->s_next;
*sp = sop->s_next;
ldap_pvt_thread_mutex_unlock( &si->si_ops_mutex );
ch_free( sop );
}
rs->sr_ctrls = NULL;
send_ldap_result( op, rs );
return rs->sr_err;
}
break;	break;
}	}
if ( changed )	if ( changed )
break;	break;
}	}
if ( !changed && !dirty ) {	if ( !changed ) {
do_present = 0;	no_change: nochange = 1;
no_change: if ( !(op->o_sync_mode & SLAP_SYNC_PERSIST) ) {	if ( !(op->o_sync_mode & SLAP_SYNC_PERSIST) ) {
LDAPControl *ctrls[2];	LDAPControl *ctrls[2];

ctrls[0] = NULL;	ctrls[0] = NULL;
Line 2582 no_change: if ( !(op->o_sync_mode & SLA	Line 2171 no_change: if ( !(op->o_sync_mode & SLA
}	}
goto shortcut;	goto shortcut;
}	}
} else {
/* consumer doesn't have the right number of CSNs */
changed = SS_CHANGED;
}	}
/* Do we have a sessionlog for this search? */	/* Do we have a sessionlog for this search? */
sl=si->si_logs;	sl=si->si_logs;
Line 2593 no_change: if ( !(op->o_sync_mode & SLA	Line 2179 no_change: if ( !(op->o_sync_mode & SLA
/* Are there any log entries, and is the consumer state	/* Are there any log entries, and is the consumer state
* present in the session log?	* present in the session log?
*/	*/
if ( sl->sl_num > 0 && ber_bvcmp( &mincsn, &sl->sl_head->se_csn ) >= 0 ) {	if ( sl->sl_num > 0 && ber_bvcmp( &mincsn, &sl->sl_mincsn ) >= 0 ) {
do_present = 0;	do_present = 0;
/* mutex is unlocked in playlog */	/* mutex is unlocked in playlog */
syncprov_playlog( op, rs, sl, srs, ctxcsn, numcsns, sids );	syncprov_playlog( op, rs, sl, srs, ctxcsn, numcsns, sids );
Line 2608 no_change: if ( !(op->o_sync_mode & SLA	Line 2194 no_change: if ( !(op->o_sync_mode & SLA
if ( si->si_usehint && srs->sr_rhint == 0 ) {	if ( si->si_usehint && srs->sr_rhint == 0 ) {
if ( ctxcsn )	if ( ctxcsn )
ber_bvarray_free_x( ctxcsn, op->o_tmpmemctx );	ber_bvarray_free_x( ctxcsn, op->o_tmpmemctx );
if ( sids )	send_ldap_error( op, rs, LDAP_SYNC_REFRESH_REQUIRED, "sync cookie is stale" );
op->o_tmpfree( sids, op->o_tmpmemctx );	return rs->sr_err;
rs->sr_err = LDAP_SYNC_REFRESH_REQUIRED;
rs->sr_text = "sync cookie is stale";
goto bailout;
}
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 {	} else {
gotstate = 1;	gotstate = 1;
/* If changed and doing Present lookup, send Present UUIDs */	/* If changed and doing Present lookup, send Present UUIDs */
Line 2630 no_change: if ( !(op->o_sync_mode & SLA	Line 2204 no_change: if ( !(op->o_sync_mode & SLA
LDAP_SUCCESS ) {	LDAP_SUCCESS ) {
if ( ctxcsn )	if ( ctxcsn )
ber_bvarray_free_x( ctxcsn, op->o_tmpmemctx );	ber_bvarray_free_x( ctxcsn, op->o_tmpmemctx );
if ( sids )	send_ldap_result( op, rs );
op->o_tmpfree( sids, op->o_tmpmemctx );	return rs->sr_err;
goto bailout;
}	}
}	}
} else {
/* No consumer state, assume something has changed */
changed = SS_CHANGED;
}	}

shortcut:	shortcut:
Line 2649 shortcut:	Line 2219 shortcut:
}	}

/* If something changed, find the changes */	/* If something changed, find the changes */
if ( gotstate && ( changed \|\| dirty ) ) {	if ( gotstate && !nochange ) {
Filter fand, fava;	Filter fand, fava;

fand = op->o_tmpalloc( sizeof(Filter), op->o_tmpmemctx );	fand = op->o_tmpalloc( sizeof(Filter), op->o_tmpmemctx );
Line 2665 shortcut:	Line 2235 shortcut:
#endif	#endif
ber_dupbv_x( &fava->f_ava->aa_value, &mincsn, op->o_tmpmemctx );	ber_dupbv_x( &fava->f_ava->aa_value, &mincsn, op->o_tmpmemctx );
fava->f_next = op->ors_filter;	fava->f_next = op->ors_filter;
if ( sop )
ldap_pvt_thread_mutex_lock( &sop->s_mutex );
op->ors_filter = fand;	op->ors_filter = fand;
filter2bv_x( op, op->ors_filter, &op->ors_filterstr );	filter2bv_x( op, op->ors_filter, &op->ors_filterstr );
if ( sop ) {	if ( sop )
sop->s_flags \|= PS_FIX_FILTER;	sop->s_flags \|= PS_FIX_FILTER;
ldap_pvt_thread_mutex_unlock( &sop->s_mutex );
}
}	}

/* Let our callback add needed info to returned entries */	/* Let our callback add needed info to returned entries */
Line 2680 shortcut:	Line 2246 shortcut:
ss = (searchstate *)(cb+1);	ss = (searchstate *)(cb+1);
ss->ss_on = on;	ss->ss_on = on;
ss->ss_so = sop;	ss->ss_so = sop;
ss->ss_flags = do_present \| changed;	ss->ss_present = do_present;
ss->ss_ctxcsn = ctxcsn;	ss->ss_ctxcsn = ctxcsn;
ss->ss_numcsns = numcsns;	ss->ss_numcsns = numcsns;
ss->ss_sids = sids;	ss->ss_sids = sids;
Line 2694 shortcut:	Line 2260 shortcut:
* the refresh phase, just invoke the response callback to transition	* the refresh phase, just invoke the response callback to transition
* us into persist phase	* us into persist phase
*/	*/
if ( !changed && !dirty ) {	if ( nochange ) {
rs->sr_err = LDAP_SUCCESS;	rs->sr_err = LDAP_SUCCESS;
rs->sr_nentries = 0;	rs->sr_nentries = 0;
send_ldap_result( op, rs );	send_ldap_result( op, rs );
Line 2711 syncprov_operational(	Line 2277 syncprov_operational(
slap_overinst on = (slap_overinst )op->o_bd->bd_info;	slap_overinst on = (slap_overinst )op->o_bd->bd_info;
syncprov_info_t si = (syncprov_info_t )on->on_bi.bi_private;	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 &&	if ( rs->sr_entry &&
dn_match( &rs->sr_entry->e_nname, &si->si_contextdn )) {	dn_match( &rs->sr_entry->e_nname, op->o_bd->be_nsuffix )) {

if ( SLAP_OPATTRS( rs->sr_attr_flags ) \|\|	if ( SLAP_OPATTRS( rs->sr_attr_flags ) \|\|
ad_inlist( slap_schema.si_ad_contextCSN, rs->sr_attrs )) {	ad_inlist( slap_schema.si_ad_contextCSN, rs->sr_attrs )) {
Line 2740 syncprov_operational(	Line 2300 syncprov_operational(
}	}

if ( !ap ) {	if ( !ap ) {
if ( !(rs->sr_flags & REP_ENTRY_MODIFIABLE) ) {	if ( !rs->sr_flags & REP_ENTRY_MODIFIABLE ) {
Entry *e = entry_dup( rs->sr_entry );	rs->sr_entry = 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;
rs->sr_flags \|=	rs->sr_flags \|=
REP_ENTRY_MODIFIABLE\|REP_ENTRY_MUSTBEFREED;	REP_ENTRY_MODIFIABLE\|REP_ENTRY_MUSTBEFREED;
a = attr_find( rs->sr_entry->e_attrs,	a = attr_find( rs->sr_entry->e_attrs,
slap_schema.si_ad_contextCSN );	slap_schema.si_ad_contextCSN );
}	}
if ( a->a_nvals != a->a_vals ) {	free( a->a_vals );
ber_bvarray_free( a->a_nvals );
}
a->a_nvals = NULL;
ber_bvarray_free( a->a_vals );
a->a_vals = NULL;
a->a_numvals = 0;
}	}
attr_valadd( a, si->si_ctxcsn, si->si_ctxcsn, si->si_numcsns );	ber_bvarray_dup_x( &a->a_vals, si->si_ctxcsn, NULL );
	a->a_nvals = a->a_vals;
}	}
ldap_pvt_thread_rdwr_runlock( &si->si_csn_rwlock );	ldap_pvt_thread_rdwr_runlock( &si->si_csn_rwlock );
}	}
Line 2804 static ConfigOCs spocs[] = {	Line 2352 static ConfigOCs spocs[] = {
"NAME 'olcSyncProvConfig' "	"NAME 'olcSyncProvConfig' "
"DESC 'SyncRepl Provider configuration' "	"DESC 'SyncRepl Provider configuration' "
"SUP olcOverlayConfig "	"SUP olcOverlayConfig "
"MAY ( olcSpCheckpoint "	"MAY ( olcSpCheckpoint $ olcSpSessionlog $ olcSpNoPresent ) )",
"$ olcSpSessionlog "
"$ olcSpNoPresent "
"$ olcSpReloadHint "
") )",
Cft_Overlay, spcfg },	Cft_Overlay, spcfg },
{ NULL, 0, NULL }	{ NULL, 0, NULL }
};	};
Line 2825 sp_cf_gen(ConfigArgs *c)	Line 2369 sp_cf_gen(ConfigArgs *c)
case SP_CHKPT:	case SP_CHKPT:
if ( si->si_chkops \|\| si->si_chktime ) {	if ( si->si_chkops \|\| si->si_chktime ) {
struct berval bv;	struct berval bv;
/* we assume si_chktime is a multiple of 60	bv.bv_len = sprintf( c->msg, "%d %d",
* because the parsed value was originally	si->si_chkops, si->si_chktime );
* multiplied by 60 */	bv.bv_val = c->msg;
bv.bv_len = snprintf( c->cr_msg, sizeof( c->cr_msg ),	value_add_one( &c->rvalue_vals, &bv );
"%d %d", si->si_chkops, si->si_chktime/60 );
if ( bv.bv_len >= sizeof( c->cr_msg ) ) {
rc = 1;
} else {
bv.bv_val = c->cr_msg;
value_add_one( &c->rvalue_vals, &bv );
}
} else {	} else {
rc = 1;	rc = 1;
}	}
Line 2893 sp_cf_gen(ConfigArgs *c)	Line 2430 sp_cf_gen(ConfigArgs *c)
switch ( c->type ) {	switch ( c->type ) {
case SP_CHKPT:	case SP_CHKPT:
if ( lutil_atoi( &si->si_chkops, c->argv[1] ) != 0 ) {	if ( lutil_atoi( &si->si_chkops, c->argv[1] ) != 0 ) {
snprintf( c->cr_msg, sizeof( c->cr_msg ), "%s unable to parse checkpoint ops # \"%s\"",	snprintf( c->msg, sizeof( c->msg ), "%s unable to parse checkpoint ops # \"%s\"",
c->argv[0], c->argv[1] );	c->argv[0], c->argv[1] );
Debug( LDAP_DEBUG_CONFIG\|LDAP_DEBUG_NONE,	Debug( LDAP_DEBUG_CONFIG\|LDAP_DEBUG_NONE,
"%s: %s\n", c->log, c->cr_msg, 0 );	"%s: %s\n", c->log, c->msg, 0 );
return ARG_BAD_CONF;	return ARG_BAD_CONF;
}	}
if ( si->si_chkops <= 0 ) {	if ( si->si_chkops <= 0 ) {
snprintf( c->cr_msg, sizeof( c->cr_msg ), "%s invalid checkpoint ops # \"%d\"",	snprintf( c->msg, sizeof( c->msg ), "%s invalid checkpoint ops # \"%d\"",
c->argv[0], si->si_chkops );	c->argv[0], si->si_chkops );
Debug( LDAP_DEBUG_CONFIG\|LDAP_DEBUG_NONE,	Debug( LDAP_DEBUG_CONFIG\|LDAP_DEBUG_NONE,
"%s: %s\n", c->log, c->cr_msg, 0 );	"%s: %s\n", c->log, c->msg, 0 );
return ARG_BAD_CONF;	return ARG_BAD_CONF;
}	}
if ( lutil_atoi( &si->si_chktime, c->argv[2] ) != 0 ) {	if ( lutil_atoi( &si->si_chktime, c->argv[2] ) != 0 ) {
snprintf( c->cr_msg, sizeof( c->cr_msg ), "%s unable to parse checkpoint time \"%s\"",	snprintf( c->msg, sizeof( c->msg ), "%s unable to parse checkpoint time \"%s\"",
c->argv[0], c->argv[1] );	c->argv[0], c->argv[1] );
Debug( LDAP_DEBUG_CONFIG\|LDAP_DEBUG_NONE,	Debug( LDAP_DEBUG_CONFIG\|LDAP_DEBUG_NONE,
"%s: %s\n", c->log, c->cr_msg, 0 );	"%s: %s\n", c->log, c->msg, 0 );
return ARG_BAD_CONF;	return ARG_BAD_CONF;
}	}
if ( si->si_chktime <= 0 ) {	if ( si->si_chktime <= 0 ) {
snprintf( c->cr_msg, sizeof( c->cr_msg ), "%s invalid checkpoint time \"%d\"",	snprintf( c->msg, sizeof( c->msg ), "%s invalid checkpoint time \"%d\"",
c->argv[0], si->si_chkops );	c->argv[0], si->si_chkops );
Debug( LDAP_DEBUG_CONFIG\|LDAP_DEBUG_NONE,	Debug( LDAP_DEBUG_CONFIG\|LDAP_DEBUG_NONE,
"%s: %s\n", c->log, c->cr_msg, 0 );	"%s: %s\n", c->log, c->msg, 0 );
return ARG_BAD_CONF;	return ARG_BAD_CONF;
}	}
si->si_chktime *= 60;	si->si_chktime *= 60;
Line 2927 sp_cf_gen(ConfigArgs *c)	Line 2464 sp_cf_gen(ConfigArgs *c)
int size = c->value_int;	int size = c->value_int;

if ( size < 0 ) {	if ( size < 0 ) {
snprintf( c->cr_msg, sizeof( c->cr_msg ), "%s size %d is negative",	snprintf( c->msg, sizeof( c->msg ), "%s size %d is negative",
c->argv[0], size );	c->argv[0], size );
Debug( LDAP_DEBUG_CONFIG\|LDAP_DEBUG_NONE,	Debug( LDAP_DEBUG_CONFIG\|LDAP_DEBUG_NONE,
"%s: %s\n", c->log, c->cr_msg, 0 );	"%s: %s\n", c->log, c->msg, 0 );
return ARG_BAD_CONF;	return ARG_BAD_CONF;
}	}
sl = si->si_logs;	sl = si->si_logs;
if ( !sl ) {	if ( !sl ) {
sl = ch_malloc( sizeof( sessionlog ) );	sl = ch_malloc( sizeof( sessionlog ) + LDAP_LUTIL_CSNSTR_BUFSIZE );
	sl->sl_mincsn.bv_val = (char *)(sl+1);
	sl->sl_mincsn.bv_len = 0;
sl->sl_num = 0;	sl->sl_num = 0;
sl->sl_head = sl->sl_tail = NULL;	sl->sl_head = sl->sl_tail = NULL;
ldap_pvt_thread_mutex_init( &sl->sl_mutex );	ldap_pvt_thread_mutex_init( &sl->sl_mutex );
Line 2972 syncprov_db_otask(	Line 2511 syncprov_db_otask(
*/	*/
static int	static int
syncprov_db_open(	syncprov_db_open(
BackendDB *be,	BackendDB *be
ConfigReply *cr
)	)
{	{
slap_overinst on = (slap_overinst ) be->bd_info;	slap_overinst on = (slap_overinst ) be->bd_info;
Line 3003 syncprov_db_open(	Line 2541 syncprov_db_open(
}	}

thrctx = ldap_pvt_thread_pool_context();	thrctx = ldap_pvt_thread_pool_context();
connection_fake_init2( &conn, &opbuf, thrctx, 0 );	connection_fake_init( &conn, &opbuf, thrctx );
op = &opbuf.ob_op;	op = &opbuf.ob_op;
op->o_bd = be;	op->o_bd = be;
op->o_dn = be->be_rootdn;	op->o_dn = be->be_rootdn;
op->o_ndn = be->be_rootndn;	op->o_ndn = be->be_rootndn;

if ( SLAP_SYNC_SUBENTRY( be )) {	rc = overlay_entry_get_ov( op, be->be_nsuffix, NULL,
build_new_dn( &si->si_contextdn, be->be_nsuffix,
(struct berval *)&slap_ldapsync_cn_bv, NULL );
} else {
si->si_contextdn = be->be_nsuffix[0];
}
rc = overlay_entry_get_ov( op, &si->si_contextdn, NULL,
slap_schema.si_ad_contextCSN, 0, &e, on );	slap_schema.si_ad_contextCSN, 0, &e, on );

if ( e ) {	if ( e ) {
Line 3023 syncprov_db_open(	Line 2555 syncprov_db_open(

a = attr_find( e->e_attrs, slap_schema.si_ad_contextCSN );	a = attr_find( e->e_attrs, slap_schema.si_ad_contextCSN );
if ( a ) {	if ( a ) {
	int i;
ber_bvarray_dup_x( &si->si_ctxcsn, a->a_vals, NULL );	ber_bvarray_dup_x( &si->si_ctxcsn, a->a_vals, NULL );
si->si_numcsns = a->a_numvals;	for ( i = 0; !BER_BVISNULL( &a->a_vals[i] ); i++ );
si->si_sids = slap_parse_csn_sids( si->si_ctxcsn, a->a_numvals, NULL );	si->si_numcsns = i;
	si->si_sids = slap_parse_csn_sids( si->si_ctxcsn, i, NULL );
}	}
overlay_entry_release_ov( op, e, 0, on );	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_dn = be->be_suffix[0];
op->o_req_ndn = be->be_nsuffix[0];	op->o_req_ndn = be->be_nsuffix[0];
op->ors_scope = LDAP_SCOPE_SUBTREE;	op->ors_scope = LDAP_SCOPE_SUBTREE;
Line 3039 syncprov_db_open(	Line 2573 syncprov_db_open(

/* Didn't find a contextCSN, should we generate one? */	/* Didn't find a contextCSN, should we generate one? */
if ( !si->si_ctxcsn ) {	if ( !si->si_ctxcsn ) {
char csnbuf[ LDAP_PVT_CSNSTR_BUFSIZE ];	char csnbuf[ LDAP_LUTIL_CSNSTR_BUFSIZE ];
struct berval csn;	struct berval csn;

if ( SLAP_SYNC_SHADOW( op->o_bd )) {	if ( SLAP_SYNC_SHADOW( op->o_bd )) {
Line 3070 out:	Line 2604 out:
*/	*/
static int	static int
syncprov_db_close(	syncprov_db_close(
BackendDB *be,	BackendDB *be
ConfigReply *cr
)	)
{	{
slap_overinst on = (slap_overinst ) be->bd_info;	slap_overinst on = (slap_overinst ) be->bd_info;
Line 3081 syncprov_db_close(	Line 2614 syncprov_db_close(
return 0;	return 0;
}	}
if ( si->si_numops ) {	if ( si->si_numops ) {
Connection conn = {0};	Connection conn;
OperationBuffer opbuf;	OperationBuffer opbuf;
Operation *op;	Operation *op;
SlapReply rs = {REP_RESULT};	SlapReply rs = {REP_RESULT};
void *thrctx;	void *thrctx;

thrctx = ldap_pvt_thread_pool_context();	thrctx = ldap_pvt_thread_pool_context();
connection_fake_init2( &conn, &opbuf, thrctx, 0 );	connection_fake_init( &conn, &opbuf, thrctx );
op = &opbuf.ob_op;	op = &opbuf.ob_op;
op->o_bd = be;	op->o_bd = be;
op->o_dn = be->be_rootdn;	op->o_dn = be->be_rootdn;
Line 3101 syncprov_db_close(	Line 2634 syncprov_db_close(

static int	static int
syncprov_db_init(	syncprov_db_init(
BackendDB *be,	BackendDB *be
ConfigReply *cr
)	)
{	{
slap_overinst on = (slap_overinst )be->bd_info;	slap_overinst on = (slap_overinst )be->bd_info;
Line 3120 syncprov_db_init(	Line 2652 syncprov_db_init(
ldap_pvt_thread_rdwr_init( &si->si_csn_rwlock );	ldap_pvt_thread_rdwr_init( &si->si_csn_rwlock );
ldap_pvt_thread_mutex_init( &si->si_ops_mutex );	ldap_pvt_thread_mutex_init( &si->si_ops_mutex );
ldap_pvt_thread_mutex_init( &si->si_mods_mutex );	ldap_pvt_thread_mutex_init( &si->si_mods_mutex );
ldap_pvt_thread_mutex_init( &si->si_resp_mutex );

csn_anlist[0].an_desc = slap_schema.si_ad_entryCSN;	csn_anlist[0].an_desc = slap_schema.si_ad_entryCSN;
csn_anlist[0].an_name = slap_schema.si_ad_entryCSN->ad_cname;	csn_anlist[0].an_name = slap_schema.si_ad_entryCSN->ad_cname;
Line 3135 syncprov_db_init(	Line 2666 syncprov_db_init(

static int	static int
syncprov_db_destroy(	syncprov_db_destroy(
BackendDB *be,	BackendDB *be
ConfigReply *cr
)	)
{	{
slap_overinst on = (slap_overinst )be->bd_info;	slap_overinst on = (slap_overinst )be->bd_info;
Line 3158 syncprov_db_destroy(	Line 2688 syncprov_db_destroy(
ber_bvarray_free( si->si_ctxcsn );	ber_bvarray_free( si->si_ctxcsn );
if ( si->si_sids )	if ( si->si_sids )
ch_free( si->si_sids );	ch_free( si->si_sids );
ldap_pvt_thread_mutex_destroy( &si->si_resp_mutex );
ldap_pvt_thread_mutex_destroy( &si->si_mods_mutex );	ldap_pvt_thread_mutex_destroy( &si->si_mods_mutex );
ldap_pvt_thread_mutex_destroy( &si->si_ops_mutex );	ldap_pvt_thread_mutex_destroy( &si->si_ops_mutex );
ldap_pvt_thread_rdwr_destroy( &si->si_csn_rwlock );	ldap_pvt_thread_rdwr_destroy( &si->si_csn_rwlock );
Line 3256 static int syncprov_parseCtrl (	Line 2785 static int syncprov_parseCtrl (
sr->sr_rhint = rhint;	sr->sr_rhint = rhint;
if (!BER_BVISNULL(&cookie)) {	if (!BER_BVISNULL(&cookie)) {
ber_dupbv_x( &sr->sr_state.octet_str, &cookie, op->o_tmpmemctx );	ber_dupbv_x( &sr->sr_state.octet_str, &cookie, op->o_tmpmemctx );
/* If parse fails, pretend no cookie was sent */	slap_parse_sync_cookie( &sr->sr_state, op->o_tmpmemctx );
if ( slap_parse_sync_cookie( &sr->sr_state, op->o_tmpmemctx ) \|\|	if ( sr->sr_state.rid == -1 ) {
sr->sr_state.rid == -1 ) {	rs->sr_text = "Sync control : cookie parsing error";
if ( sr->sr_state.ctxcsn ) {	return LDAP_PROTOCOL_ERROR;
ber_bvarray_free_x( sr->sr_state.ctxcsn, op->o_tmpmemctx );
sr->sr_state.ctxcsn = NULL;
}
sr->sr_state.numcsns = 0;
}	}
}	}

Removed from v.1.147.2.81
changed lines
	Added in v.1.189