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.56.2.15 and 1.56.2.32

version 1.56.2.15, 2005/09/28 00:30:35	version 1.56.2.32, 2006/05/15 15:51:59
Line 1	Line 1
/* $OpenLDAP: pkg/ldap/servers/slapd/overlays/syncprov.c,v 1.106 2005/09/14 13:25:52 hyc Exp $ */	/* $OpenLDAP: pkg/ldap/servers/slapd/overlays/syncprov.c,v 1.150 2006/05/11 08:46:44 hyc 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-2005 The OpenLDAP Foundation.	* Copyright 2004-2006 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 26	Line 26
#include "lutil.h"	#include "lutil.h"
#include "slap.h"	#include "slap.h"
#include "config.h"	#include "config.h"
	#include "ldap_rq.h"

/* A modify request on a particular entry */	/* A modify request on a particular entry */
typedef struct modinst {	typedef struct modinst {
Line 60 typedef struct syncops {	Line 61 typedef struct syncops {
int s_rid;	int s_rid;
struct berval s_filterstr;	struct berval s_filterstr;
int s_flags; /* search status */	int s_flags; /* search status */
	#define PS_IS_REFRESHING 0x01
	#define PS_IS_DETACHED 0x02
	#define PS_WROTE_BASE 0x04
	#define PS_FIND_BASE 0x08

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 83 typedef struct sync_control {	Line 91 typedef struct sync_control {
#define SLAP_SYNC_PERSIST (LDAP_SYNC_RESERVED<<SLAP_CONTROL_SHIFT)	#define SLAP_SYNC_PERSIST (LDAP_SYNC_RESERVED<<SLAP_CONTROL_SHIFT)
#define SLAP_SYNC_REFRESH_AND_PERSIST (LDAP_SYNC_REFRESH_AND_PERSIST<<SLAP_CONTROL_SHIFT)	#define SLAP_SYNC_REFRESH_AND_PERSIST (LDAP_SYNC_REFRESH_AND_PERSIST<<SLAP_CONTROL_SHIFT)

#define PS_IS_REFRESHING 0x01
#define PS_IS_DETACHED 0x02

/* Record of which searches matched at premodify step */	/* Record of which searches matched at premodify step */
typedef struct syncmatches {	typedef struct syncmatches {
struct syncmatches *sm_next;	struct syncmatches *sm_next;
Line 117 typedef struct syncprov_info_t {	Line 122 typedef struct syncprov_info_t {
int si_chktime;	int si_chktime;
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 */
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;
Line 360 findbase_cb( Operation op, SlapReply r	Line 366 findbase_cb( Operation op, SlapReply r
* Just store whatever we got.	* Just store whatever we got.
*/	*/
if ( fc->fss->s_eid == NOID ) {	if ( fc->fss->s_eid == NOID ) {
fc->fbase = 1;	fc->fbase = 2;
fc->fss->s_eid = rs->sr_entry->e_id;	fc->fss->s_eid = rs->sr_entry->e_id;
ber_dupbv( &fc->fss->s_base, &rs->sr_entry->e_nname );	ber_dupbv( &fc->fss->s_base, &rs->sr_entry->e_nname );

} else if ( rs->sr_entry->e_id == fc->fss->s_eid &&	} else if ( rs->sr_entry->e_id == fc->fss->s_eid &&
dn_match( &rs->sr_entry->e_nname, &fc->fss->s_base )) {	dn_match( &rs->sr_entry->e_nname, &fc->fss->s_base )) {

/* OK, the DN is the same and the entryID is the same. Now	/* OK, the DN is the same and the entryID is the same. */
* see if the fdn resides in the scope.
*/
fc->fbase = 1;	fc->fbase = 1;
switch ( fc->fss->s_op->ors_scope ) {
case LDAP_SCOPE_BASE:
fc->fscope = dn_match( fc->fdn, &rs->sr_entry->e_nname );
break;
case LDAP_SCOPE_ONELEVEL: {
struct berval pdn;
dnParent( fc->fdn, &pdn );
fc->fscope = dn_match( &pdn, &rs->sr_entry->e_nname );
break; }
case LDAP_SCOPE_SUBTREE:
fc->fscope = dnIsSuffix( fc->fdn, &rs->sr_entry->e_nname );
break;
#ifdef LDAP_SCOPE_SUBORDINATE
case LDAP_SCOPE_SUBORDINATE:
fc->fscope = dnIsSuffix( fc->fdn, &rs->sr_entry->e_nname ) &&
!dn_match( fc->fdn, &rs->sr_entry->e_nname );
break;
#endif
}
}	}
}	}
if ( rs->sr_err != LDAP_SUCCESS ) {	if ( rs->sr_err != LDAP_SUCCESS ) {
Line 398 findbase_cb( Operation op, SlapReply r	Line 383 findbase_cb( Operation op, SlapReply r
return LDAP_SUCCESS;	return LDAP_SUCCESS;
}	}

	static Filter generic_filter = { LDAP_FILTER_PRESENT, { 0 }, NULL };
	static struct berval generic_filterstr = BER_BVC("(objectclass=*)");

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;	opcookie *opc = op->o_callback->sc_private;
slap_overinst *on = opc->son;	slap_overinst *on = opc->son;

slap_callback cb = {0};
Operation fop;
SlapReply frs = { REP_RESULT };
int rc;

/* 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
*/	*/
fop = *fc->fss->s_op;	ldap_pvt_thread_mutex_lock( &fc->fss->s_mutex );
	if ( fc->fss->s_flags & PS_FIND_BASE ) {
	slap_callback cb = {0};
	Operation fop;
	SlapReply frs = { REP_RESULT };
	int rc;

fop.o_hdr = op->o_hdr;	fc->fss->s_flags ^= PS_FIND_BASE;
fop.o_bd = op->o_bd;	ldap_pvt_thread_mutex_unlock( &fc->fss->s_mutex );
fop.o_time = op->o_time;
fop.o_tincr = op->o_tincr;

cb.sc_response = findbase_cb;	fop = *fc->fss->s_op;
cb.sc_private = fc;

fop.o_sync_mode = 0; /* turn off sync mode */	fop.o_hdr = op->o_hdr;
fop.o_managedsait = SLAP_CONTROL_CRITICAL;	fop.o_bd = op->o_bd;
fop.o_callback = &cb;	fop.o_time = op->o_time;
fop.o_tag = LDAP_REQ_SEARCH;	fop.o_tincr = op->o_tincr;
fop.ors_scope = LDAP_SCOPE_BASE;
fop.ors_limit = NULL;
fop.ors_slimit = 1;
fop.ors_tlimit = SLAP_NO_LIMIT;
fop.ors_attrs = slap_anlist_no_attrs;
fop.ors_attrsonly = 1;

fop.o_bd->bd_info = on->on_info->oi_orig;	cb.sc_response = findbase_cb;
rc = fop.o_bd->be_search( &fop, &frs );	cb.sc_private = fc;
fop.o_bd->bd_info = (BackendInfo *)on;

if ( fc->fbase ) return LDAP_SUCCESS;	fop.o_sync_mode = 0; /* turn off sync mode */
	fop.o_managedsait = SLAP_CONTROL_CRITICAL;
	fop.o_callback = &cb;
	fop.o_tag = LDAP_REQ_SEARCH;
	fop.ors_scope = LDAP_SCOPE_BASE;
	fop.ors_limit = NULL;
	fop.ors_slimit = 1;
	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 );
	fop.o_bd->bd_info = (BackendInfo *)on;
	} else {
	ldap_pvt_thread_mutex_unlock( &fc->fss->s_mutex );
	fc->fbase = 1;
	}

	/* After the first call, see if the fdn resides in the scope */
	if ( fc->fbase == 1 ) {
	switch ( fc->fss->s_op->ors_scope ) {
	case LDAP_SCOPE_BASE:
	fc->fscope = dn_match( fc->fdn, &fc->fss->s_base );
	break;
	case LDAP_SCOPE_ONELEVEL: {
	struct berval pdn;
	dnParent( fc->fdn, &pdn );
	fc->fscope = dn_match( &pdn, &fc->fss->s_base );
	break; }
	case LDAP_SCOPE_SUBTREE:
	fc->fscope = dnIsSuffix( fc->fdn, &fc->fss->s_base );
	break;
	case LDAP_SCOPE_SUBORDINATE:
	fc->fscope = dnIsSuffix( fc->fdn, &fc->fss->s_base ) &&
	!dn_match( fc->fdn, &fc->fss->s_base );
	break;
	}
	}

	if ( fc->fbase )
	return LDAP_SUCCESS;

/* If entryID has changed, then the base of this search has	/* If entryID has changed, then the base of this search has
* changed. Invalidate the psearch.	* changed. Invalidate the psearch.
Line 460 syncprov_findbase( Operation *op, fbase_	Line 481 syncprov_findbase( Operation *op, fbase_
* CSN, and generate Present records for them. We always collect this result	* CSN, and generate Present records for them. We always collect this result
* in SyncID sets, even if there's only one match.	* in SyncID sets, even if there's only one match.
*/	*/
#define FIND_MAXCSN 1	typedef enum find_csn_t {
#define FIND_CSN 2	FIND_MAXCSN = 1,
#define FIND_PRESENT 3	FIND_CSN = 2,
	FIND_PRESENT = 3
	} find_csn_t;

static int	static int
findmax_cb( Operation op, SlapReply rs )	findmax_cb( Operation op, SlapReply rs )
Line 485 findcsn_cb( Operation op, SlapReply rs	Line 508 findcsn_cb( Operation op, SlapReply rs
{	{
slap_callback *sc = op->o_callback;	slap_callback *sc = op->o_callback;

if ( rs->sr_type == REP_SEARCH && rs->sr_err == LDAP_SUCCESS ) {	/* 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 )) {
sc->sc_private = (void *)1;	sc->sc_private = (void *)1;
}	}
return LDAP_SUCCESS;	return LDAP_SUCCESS;
Line 541 findpres_cb( Operation op, SlapReply r	Line 568 findpres_cb( Operation op, SlapReply r
}	}

static int	static int
syncprov_findcsn( Operation *op, int mode )	syncprov_findcsn( Operation *op, find_csn_t mode )
{	{
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;
Line 558 syncprov_findcsn( Operation *op, int mod	Line 585 syncprov_findcsn( Operation *op, int mod
#else	#else
AttributeAssertion eq = { NULL, BER_BVNULL };	AttributeAssertion eq = { NULL, BER_BVNULL };
#endif	#endif
int i, rc = LDAP_SUCCESS;
fpres_cookie pcookie;	fpres_cookie pcookie;
sync_control *srs = NULL;	sync_control *srs = NULL;
int findcsn_retry = 1;	struct slap_limits_set fc_limits;
	int i, rc = LDAP_SUCCESS, findcsn_retry = 1;

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 612 again:	Line 639 again:
/* 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;
	fc_limits.lms_s_unchecked = 1;
fop.ors_filterstr.bv_len = sprintf( buf, "(entryCSN<=%s)",	fop.ors_filterstr.bv_len = sprintf( buf, "(entryCSN<=%s)",
cf.f_av_value.bv_val );	cf.f_av_value.bv_val );
}	}
Line 680 again:	Line 709 again:
return rc;	return rc;
}	}

/* Queue a persistent search response */	static void
static int	syncprov_free_syncop( syncops *so )
syncprov_qresp( opcookie opc, syncops so, int mode )
{	{
syncres *sr;	syncres sr, srnext;
	GroupAssertion ga, gnext;
sr = ch_malloc(sizeof(syncres) + opc->suuid.bv_len + 1 +
opc->sdn.bv_len + 1 + opc->sndn.bv_len + 1 + opc->sctxcsn.bv_len + 1 );
sr->s_next = NULL;
sr->s_dn.bv_val = (char *)(sr + 1);
sr->s_dn.bv_len = opc->sdn.bv_len;
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 );
sr->s_ndn.bv_len = opc->sndn.bv_len;
*(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;
*(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 );

if ( !so->s_res ) {	ldap_pvt_thread_mutex_lock( &so->s_mutex );
so->s_res = sr;	if ( --so->s_inuse > 0 ) {
} else {	ldap_pvt_thread_mutex_unlock( &so->s_mutex );
so->s_restail->s_next = sr;	return;
}	}
so->s_restail = sr;
ldap_pvt_thread_mutex_unlock( &so->s_mutex );	ldap_pvt_thread_mutex_unlock( &so->s_mutex );
return LDAP_SUCCESS;	if ( so->s_flags & PS_IS_DETACHED ) {
}	filter_free( so->s_op->ors_filter );
	for ( ga = so->s_op->o_groups; ga; ga=gnext ) {
/* Play back queued responses */	gnext = ga->ga_next;
static int	ch_free( ga );
syncprov_sendresp( Operation op, opcookie opc, syncops so, Entry *e, int mode, int queue );

static int
syncprov_qplay( Operation op, slap_overinst on, syncops *so )
{
syncres sr, srnext;
Entry *e;
opcookie opc;
int rc;

opc.son = on;
op->o_bd->bd_info = (BackendInfo *)on->on_info;
for (sr = so->s_res; sr; sr=srnext) {
srnext = sr->s_next;
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 );
so->s_res = srnext;
continue;
}
}
rc = syncprov_sendresp( op, &opc, so, &e, sr->s_mode, 0 );

if ( e ) {
be_entry_release_rw( op, e, 0 );
}	}
if ( rc )	ch_free( so->s_op );
break;	}
	ch_free( so->s_base.bv_val );
	for ( sr=so->s_res; sr; sr=srnext ) {
	srnext = sr->s_next;
ch_free( sr );	ch_free( sr );
so->s_res = srnext;
}	}
op->o_bd->bd_info = (BackendInfo *)on;	ldap_pvt_thread_mutex_destroy( &so->s_mutex );
if ( !so->s_res )	ch_free( so );
so->s_restail = NULL;
return rc;
}	}

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

Line 772 syncprov_sendresp( Operation *op, opcook	Line 750 syncprov_sendresp( Operation *op, opcook
struct berval cookie;	struct berval cookie;
Entry e_uuid = {0};	Entry e_uuid = {0};
Attribute a_uuid = {0};	Attribute a_uuid = {0};
Operation sop = *so->s_op;
Opheader ohdr;

if ( so->s_op->o_abandon )	if ( so->s_op->o_abandon )
return SLAPD_ABANDON;	return SLAPD_ABANDON;

ohdr = *sop.o_hdr;
sop.o_hdr = &ohdr;
sop.o_tmpmemctx = op->o_tmpmemctx;
sop.o_bd = op->o_bd;
sop.o_controls = op->o_controls;
sop.o_private = op->o_private;
sop.o_callback = NULL;

/* If queueing is allowed */
if ( queue ) {
ldap_pvt_thread_mutex_lock( &so->s_mutex );
/* If we're still in refresh mode, must queue */
if (so->s_flags & PS_IS_REFRESHING) {
return syncprov_qresp( opc, so, mode );
}
/* If connection is free but queue is non-empty,
* try to flush the queue.
*/
if ( so->s_res ) {
rs.sr_err = syncprov_qplay( &sop, on, so );
}
/* If the connection is busy, must queue */
if ( sop.o_conn->c_writewaiter \|\| rs.sr_err == LDAP_BUSY ) {
return syncprov_qresp( opc, so, mode );
}
ldap_pvt_thread_mutex_unlock( &so->s_mutex );

/* If syncprov_qplay returned any other error, bail out. */
if ( rs.sr_err ) {
return rs.sr_err;
}
} else {
/* Queueing not allowed and conn is busy, give up */
if ( sop.o_conn->c_writewaiter )
return LDAP_BUSY;
}

ctrls[1] = NULL;	ctrls[1] = NULL;
slap_compose_sync_cookie( op, &cookie, &opc->sctxcsn, so->s_rid );	slap_compose_sync_cookie( op, &cookie, &opc->sctxcsn, so->s_rid );

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( &sop, &rs, &e_uuid,	rs.sr_err = syncprov_state_ctrl( op, &rs, &e_uuid,
mode, ctrls, 0, 1, &cookie );	mode, ctrls, 0, 1, &cookie );
	op->o_tmpfree( cookie.bv_val, op->o_tmpmemctx );

rs.sr_ctrls = ctrls;	rs.sr_ctrls = ctrls;
op->o_bd->bd_info = (BackendInfo *)on->on_info;	op->o_bd->bd_info = (BackendInfo *)on->on_info;
Line 832 syncprov_sendresp( Operation *op, opcook	Line 772 syncprov_sendresp( Operation *op, opcook
if ( rs.sr_entry->e_private )	if ( rs.sr_entry->e_private )
rs.sr_flags = REP_ENTRY_MUSTRELEASE;	rs.sr_flags = REP_ENTRY_MUSTRELEASE;
if ( opc->sreference ) {	if ( opc->sreference ) {
rs.sr_ref = get_entry_referrals( &sop, rs.sr_entry );	rs.sr_ref = get_entry_referrals( op, rs.sr_entry );
send_search_reference( &sop, &rs );	send_search_reference( op, &rs );
ber_bvarray_free( rs.sr_ref );	ber_bvarray_free( rs.sr_ref );
if ( !rs.sr_entry )	if ( !rs.sr_entry )
*e = NULL;	*e = NULL;
Line 844 syncprov_sendresp( Operation *op, opcook	Line 784 syncprov_sendresp( Operation *op, opcook
rs.sr_entry = *e;	rs.sr_entry = *e;
if ( rs.sr_entry->e_private )	if ( rs.sr_entry->e_private )
rs.sr_flags = REP_ENTRY_MUSTRELEASE;	rs.sr_flags = REP_ENTRY_MUSTRELEASE;
rs.sr_attrs = sop.ors_attrs;	rs.sr_attrs = op->ors_attrs;
send_search_entry( &sop, &rs );	send_search_entry( op, &rs );
if ( !rs.sr_entry )	if ( !rs.sr_entry )
*e = NULL;	*e = NULL;
break;	break;
Line 857 syncprov_sendresp( Operation *op, opcook	Line 797 syncprov_sendresp( Operation *op, opcook
if ( opc->sreference ) {	if ( opc->sreference ) {
struct berval bv = BER_BVNULL;	struct berval bv = BER_BVNULL;
rs.sr_ref = &bv;	rs.sr_ref = &bv;
send_search_reference( &sop, &rs );	send_search_reference( op, &rs );
} else {	} else {
send_search_entry( &sop, &rs );	send_search_entry( op, &rs );
}	}
break;	break;
default:	default:
assert(0);	assert(0);
}	}
op->o_tmpfree( rs.sr_ctrls[0], op->o_tmpmemctx );	/* In case someone else freed it already? */
op->o_private = sop.o_private;	if ( rs.sr_ctrls ) {
rs.sr_ctrls = NULL;	op->o_tmpfree( rs.sr_ctrls[0], op->o_tmpmemctx );
/* Check queue again here; if we were hanging in a send and eventually	rs.sr_ctrls = NULL;
* recovered, there may be more to send now. But don't check if the	}
* original psearch has been abandoned.
*/	return rs.sr_err;
if ( so->s_op->o_abandon )	}
return SLAPD_ABANDON;
	/* Play back queued responses */
	static int
	syncprov_qplay( Operation op, slap_overinst on, syncops *so )
	{
	syncres *sr;
	Entry *e;
	opcookie opc;
	int rc = 0;

	opc.son = on;
	op->o_bd->bd_info = (BackendInfo *)on->on_info;

if ( rs.sr_err == LDAP_SUCCESS && queue && so->s_res ) {	for (;;) {
ldap_pvt_thread_mutex_lock( &so->s_mutex );	ldap_pvt_thread_mutex_lock( &so->s_mutex );
rs.sr_err = syncprov_qplay( &sop, on, so );	sr = so->s_res;
	if ( sr )
	so->s_res = sr->s_next;
	if ( !so->s_res )
	so->s_restail = NULL;
ldap_pvt_thread_mutex_unlock( &so->s_mutex );	ldap_pvt_thread_mutex_unlock( &so->s_mutex );

	if ( !sr \|\| so->s_op->o_abandon )
	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 ) {
	ch_free( sr );
	continue;
	}
	}
	rc = syncprov_sendresp( op, &opc, so, &e, sr->s_mode );

	if ( e ) {
	be_entry_release_rw( op, e, 0 );
	}

	ch_free( sr );

	if ( rc )
	break;
}	}
return rs.sr_err;	op->o_bd->bd_info = (BackendInfo *)on;
	return rc;
}	}

static void	/* runqueue task for playing back queued responses */
syncprov_free_syncop( syncops *so )	static void *
	syncprov_qtask( void ctx, void arg )
{	{
syncres sr, srnext;	struct re_s *rtask = arg;
GroupAssertion ga, gnext;	syncops *so = rtask->arg;
	slap_overinst *on = so->s_op->o_private;
	OperationBuffer opbuf;
	Operation *op;
	BackendDB be;

	op = (Operation *) &opbuf;
	op = so->s_op;
	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;

	op->o_tmpmemctx = slap_sl_mem_create(SLAP_SLAB_SIZE, SLAP_SLAB_STACK, ctx);
	op->o_tmpmfuncs = &slap_sl_mfuncs;
	op->o_threadctx = ctx;

	/* syncprov_qplay expects a fake db */
	be = *so->s_op->o_bd;
	be.be_flags \|= SLAP_DBFLAG_OVERLAY;
	op->o_bd = &be;
	op->o_private = NULL;
	op->o_callback = NULL;

	(void)syncprov_qplay( op, on, so );

	/* decrement use count... */
	syncprov_free_syncop( so );

	/* wait until we get explicitly scheduled again */
	ldap_pvt_thread_mutex_lock( &slapd_rq.rq_mutex );
	ldap_pvt_runqueue_stoptask( &slapd_rq, so->s_qtask );
	ldap_pvt_runqueue_resched( &slapd_rq, so->s_qtask, 1 );
	ldap_pvt_thread_mutex_unlock( &slapd_rq.rq_mutex );

	return NULL;
	}

	/* Queue a persistent search response */
	static int
	syncprov_qresp( opcookie opc, syncops so, int mode )
	{
	syncres *sr;

	sr = ch_malloc(sizeof(syncres) + opc->suuid.bv_len + 1 +
	opc->sdn.bv_len + 1 + opc->sndn.bv_len + 1 + opc->sctxcsn.bv_len + 1 );
	sr->s_next = NULL;
	sr->s_dn.bv_val = (char *)(sr + 1);
	sr->s_dn.bv_len = opc->sdn.bv_len;
	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_len = opc->sndn.bv_len;
	sr->s_uuid.bv_val = lutil_strcopy( sr->s_ndn.bv_val,
	opc->sndn.bv_val ) + 1;
	sr->s_uuid.bv_len = opc->suuid.bv_len;
	AC_MEMCPY( sr->s_uuid.bv_val, opc->suuid.bv_val, opc->suuid.bv_len );
	sr->s_csn.bv_val = sr->s_uuid.bv_val + sr->s_uuid.bv_len + 1;
	sr->s_csn.bv_len = opc->sctxcsn.bv_len;
	strcpy( sr->s_csn.bv_val, opc->sctxcsn.bv_val );

ldap_pvt_thread_mutex_lock( &so->s_mutex );	ldap_pvt_thread_mutex_lock( &so->s_mutex );
so->s_inuse--;	if ( !so->s_res ) {
if ( so->s_inuse > 0 ) {	so->s_res = sr;
ldap_pvt_thread_mutex_unlock( &so->s_mutex );	} else {
return;	so->s_restail->s_next = sr;
	}
	so->s_restail = sr;

	/* If the base of the psearch was modified, check it next time round */
	if ( so->s_flags & PS_WROTE_BASE ) {
	so->s_flags ^= PS_WROTE_BASE;
	so->s_flags \|= PS_FIND_BASE;
}	}
ldap_pvt_thread_mutex_unlock( &so->s_mutex );
if ( so->s_flags & PS_IS_DETACHED ) {	if ( so->s_flags & PS_IS_DETACHED ) {
filter_free( so->s_op->ors_filter );	int wake=0;
for ( ga = so->s_op->o_groups; ga; ga=gnext ) {	ldap_pvt_thread_mutex_lock( &slapd_rq.rq_mutex );
gnext = ga->ga_next;	if ( !so->s_qtask ) {
ch_free( ga );	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;
	}
}	}
ch_free( so->s_op );	ldap_pvt_thread_mutex_unlock( &slapd_rq.rq_mutex );
	if ( wake )
	slap_wake_listener();
}	}
ch_free( so->s_base.bv_val );	ldap_pvt_thread_mutex_unlock( &so->s_mutex );
for ( sr=so->s_res; sr; sr=srnext ) {	return LDAP_SUCCESS;
srnext = sr->s_next;
ch_free( sr );
}
ldap_pvt_thread_mutex_destroy( &so->s_mutex );
ch_free( so );
}	}

static int	static int
Line 1019 syncprov_matchops( Operation *op, opcook	Line 1081 syncprov_matchops( Operation *op, opcook
e = op->ora_e;	e = op->ora_e;
}	}

if ( saveit ) {	if ( saveit \|\| op->o_tag == LDAP_REQ_ADD ) {
ber_dupbv_x( &opc->sdn, &e->e_name, op->o_tmpmemctx );	ber_dupbv_x( &opc->sdn, &e->e_name, op->o_tmpmemctx );
ber_dupbv_x( &opc->sndn, &e->e_nname, op->o_tmpmemctx );	ber_dupbv_x( &opc->sndn, &e->e_nname, op->o_tmpmemctx );
opc->sreference = is_entry_referral( e );	opc->sreference = is_entry_referral( e );
}
if ( saveit \|\| op->o_tag == LDAP_REQ_ADD ) {
a = attr_find( e->e_attrs, slap_schema.si_ad_entryUUID );	a = attr_find( e->e_attrs, slap_schema.si_ad_entryUUID );
if ( a )	if ( a )
ber_dupbv_x( &opc->suuid, &a->a_nvals[0], op->o_tmpmemctx );	ber_dupbv_x( &opc->suuid, &a->a_nvals[0], op->o_tmpmemctx );
	} else if ( op->o_tag == LDAP_REQ_MODRDN && !saveit ) {
	op->o_tmpfree( opc->sndn.bv_val, op->o_tmpmemctx );
	op->o_tmpfree( opc->sdn.bv_val, op->o_tmpmemctx );
	ber_dupbv_x( &opc->sdn, &e->e_name, op->o_tmpmemctx );
	ber_dupbv_x( &opc->sndn, &e->e_nname, op->o_tmpmemctx );
}	}

ldap_pvt_thread_mutex_lock( &si->si_ops_mutex );	ldap_pvt_thread_mutex_lock( &si->si_ops_mutex );
Line 1055 syncprov_matchops( Operation *op, opcook	Line 1120 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;

	/* Did we modify the search base? */
	if ( dn_match( &op->o_req_ndn, &ss->s_base )) {
	ldap_pvt_thread_mutex_lock( &ss->s_mutex );
	ss->s_flags \|= PS_WROTE_BASE;
	ldap_pvt_thread_mutex_unlock( &ss->s_mutex );
	}

for ( sm=opc->smatches, old=(syncmatches *)&opc->smatches; sm;	for ( sm=opc->smatches, old=(syncmatches *)&opc->smatches; sm;
old=sm, sm=sm->sm_next ) {	old=sm, sm=sm->sm_next ) {
if ( sm->sm_op == ss ) {	if ( sm->sm_op == ss ) {
Line 1076 syncprov_matchops( Operation *op, opcook	Line 1150 syncprov_matchops( Operation *op, opcook
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;
sm->sm_op = ss;	sm->sm_op = ss;
ss->s_inuse++;	ldap_pvt_thread_mutex_lock( &ss->s_mutex );
	++ss->s_inuse;
	ldap_pvt_thread_mutex_unlock( &ss->s_mutex );
opc->smatches = sm;	opc->smatches = sm;
} else {	} else {
/* if found send UPDATE else send ADD */	/* if found send UPDATE else send ADD */
ss->s_inuse++;	syncprov_qresp( opc, ss,
ldap_pvt_thread_mutex_unlock( &si->si_ops_mutex );	found ? LDAP_SYNC_MODIFY : LDAP_SYNC_ADD );
syncprov_sendresp( op, opc, ss, &e,
found ? LDAP_SYNC_MODIFY : LDAP_SYNC_ADD, 1 );
ldap_pvt_thread_mutex_lock( &si->si_ops_mutex );
ss->s_inuse--;
}	}
} else if ( !saveit && found ) {	} else if ( !saveit && found ) {
/* send DELETE */	/* send DELETE */
ldap_pvt_thread_mutex_unlock( &si->si_ops_mutex );	syncprov_qresp( opc, ss, LDAP_SYNC_DELETE );
syncprov_sendresp( op, opc, ss, NULL, LDAP_SYNC_DELETE, 1 );
ldap_pvt_thread_mutex_lock( &si->si_ops_mutex );
}	}
}	}
ldap_pvt_thread_mutex_unlock( &si->si_ops_mutex );	ldap_pvt_thread_mutex_unlock( &si->si_ops_mutex );
Line 1161 syncprov_checkpoint( Operation *op, Slap	Line 1231 syncprov_checkpoint( Operation *op, Slap
syncprov_info_t *si = on->on_bi.bi_private;	syncprov_info_t *si = on->on_bi.bi_private;
Modifications mod;	Modifications mod;
Operation opm;	Operation opm;
	SlapReply rsm = { 0 };
struct berval bv[2];	struct berval bv[2];
slap_callback cb = {0};	slap_callback cb = {0};
int manage = get_manageDSAit(op);

mod.sml_values = bv;	mod.sml_values = bv;
bv[1].bv_val = NULL;	bv[1].bv_val = NULL;
Line 1183 syncprov_checkpoint( Operation *op, Slap	Line 1253 syncprov_checkpoint( Operation *op, Slap
opm.o_req_ndn = op->o_bd->be_nsuffix[0];	opm.o_req_ndn = op->o_bd->be_nsuffix[0];
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_bd->be_modify( &opm, rs );	SLAP_DBFLAGS( opm.o_bd ) \|= SLAP_DBFLAG_NOLASTMOD;
opm.o_managedsait = manage;	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 );
	}
}	}

static void	static void
Line 1204 syncprov_add_slog( Operation *op, struct	Line 1278 syncprov_add_slog( Operation *op, struct
se->se_next = NULL;	se->se_next = NULL;
se->se_tag = op->o_tag;	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 );	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_uuid.bv_len = opc->suuid.bv_len;

Line 1228 syncprov_add_slog( Operation *op, struct	Line 1302 syncprov_add_slog( Operation *op, struct
sl->sl_mincsn.bv_len = se->se_csn.bv_len;	sl->sl_mincsn.bv_len = se->se_csn.bv_len;
ch_free( se );	ch_free( se );
sl->sl_num--;	sl->sl_num--;
if ( !sl->sl_head ) {
sl->sl_tail = NULL;
}
}	}
ldap_pvt_thread_mutex_unlock( &sl->sl_mutex );	ldap_pvt_thread_mutex_unlock( &sl->sl_mutex );
}	}
Line 1249 playlog_cb( Operation op, SlapReply rs	Line 1320 playlog_cb( Operation op, SlapReply rs
/* enter with sl->sl_mutex locked, release before returning */	/* enter with sl->sl_mutex locked, release before returning */
static void	static void
syncprov_playlog( Operation op, SlapReply rs, sessionlog *sl,	syncprov_playlog( Operation op, SlapReply rs, sessionlog *sl,
struct berval oldcsn, struct berval ctxcsn )	sync_control srs, struct berval ctxcsn )
{	{
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_LUTIL_CSNSTR_BUFSIZE];
BerVarray uuids;	BerVarray uuids;
	struct berval delcsn;

if ( !sl->sl_num ) {	if ( !sl->sl_num ) {
ldap_pvt_thread_mutex_unlock( &sl->sl_mutex );	ldap_pvt_thread_mutex_unlock( &sl->sl_mutex );
Line 1267 syncprov_playlog( Operation *op, SlapRep	Line 1340 syncprov_playlog( Operation *op, SlapRep

uuids = op->o_tmpalloc( (num+1) * sizeof( struct berval ) +	uuids = op->o_tmpalloc( (num+1) * sizeof( struct berval ) +
num * UUID_LEN, op->o_tmpmemctx );	num * UUID_LEN, op->o_tmpmemctx );

uuids[0].bv_val = (char *)(uuids + num + 1);	uuids[0].bv_val = (char *)(uuids + num + 1);

	delcsn.bv_len = 0;
	delcsn.bv_val = cbuf;

/* Make a copy of the relevant UUIDs. Put the Deletes up front	/* Make a copy of the relevant UUIDs. Put the Deletes up front
* and everything else at the end. Do this first so we can	* and everything else at the end. Do this first so we can
* unlock the list mutex.	* unlock the list mutex.
*/	*/
for ( se=sl->sl_head; se; se=se->se_next ) {	for ( se=sl->sl_head; se; se=se->se_next ) {
if ( ber_bvcmp( &se->se_csn, oldcsn ) < 0 ) continue;	if ( ber_bvcmp( &se->se_csn, &srs->sr_state.ctxcsn ) <= 0 ) continue;
if ( ber_bvcmp( &se->se_csn, ctxcsn ) > 0 ) break;	if ( ber_bvcmp( &se->se_csn, ctxcsn ) > 0 ) break;
if ( se->se_tag == LDAP_REQ_DELETE ) {	if ( se->se_tag == LDAP_REQ_DELETE ) {
j = i;	j = i;
i++;	i++;
	AC_MEMCPY( cbuf, se->se_csn.bv_val, se->se_csn.bv_len );
	delcsn.bv_len = se->se_csn.bv_len;
} else {	} else {
nmods++;	nmods++;
j = num - nmods;	j = num - nmods;
Line 1360 syncprov_playlog( Operation *op, SlapRep	Line 1437 syncprov_playlog( Operation *op, SlapRep
mf.f_av_value = uuids[i];	mf.f_av_value = uuids[i];
cb.sc_private = NULL;	cb.sc_private = NULL;
fop.ors_slimit = 1;	fop.ors_slimit = 1;
	frs.sr_nentries = 0;
rc = fop.o_bd->be_search( &fop, &frs );	rc = fop.o_bd->be_search( &fop, &frs );

/* If entry was not found, add to delete list */	/* If entry was not found, add to delete list */
Line 1370 syncprov_playlog( Operation *op, SlapRep	Line 1448 syncprov_playlog( Operation *op, SlapRep
fop.o_bd->bd_info = (BackendInfo *)on;	fop.o_bd->bd_info = (BackendInfo *)on;
}	}
if ( ndel ) {	if ( ndel ) {
	struct berval cookie;

	slap_compose_sync_cookie( op, &cookie, &delcsn, srs->sr_state.rid );
uuids[ndel].bv_val = NULL;	uuids[ndel].bv_val = NULL;
syncprov_sendinfo( op, rs, LDAP_TAG_SYNC_ID_SET, NULL, 0, uuids, 1 );	syncprov_sendinfo( op, rs, LDAP_TAG_SYNC_ID_SET, &cookie, 0, uuids, 1 );
	op->o_tmpfree( cookie.bv_val, op->o_tmpmemctx );
}	}
	op->o_tmpfree( uuids, op->o_tmpmemctx );
}	}

static int	static int
Line 1444 syncprov_op_response( Operation *op, Sla	Line 1527 syncprov_op_response( Operation *op, Sla
for ( sm = opc->smatches; sm; sm=sm->sm_next ) {	for ( sm = opc->smatches; sm; sm=sm->sm_next ) {
if ( sm->sm_op->s_op->o_abandon )	if ( sm->sm_op->s_op->o_abandon )
continue;	continue;
syncprov_sendresp( op, opc, sm->sm_op, NULL,	syncprov_qresp( opc, sm->sm_op, LDAP_SYNC_DELETE );
LDAP_SYNC_DELETE, 1 );
}	}
break;	break;
}	}
Line 1633 syncprov_search_cleanup( Operation *op,	Line 1715 syncprov_search_cleanup( Operation *op,
}	}

static void	static void
syncprov_detach_op( Operation op, syncops so )	syncprov_detach_op( Operation op, syncops so, slap_overinst *on )
{	{
Operation *op2;	Operation *op2;
int i, alen = 0;	int i, alen = 0;
Line 1659 syncprov_detach_op( Operation *op, synco	Line 1741 syncprov_detach_op( Operation *op, synco
op2->o_hdr = op->o_hdr;	op2->o_hdr = op->o_hdr;
op2->o_tag = op->o_tag;	op2->o_tag = op->o_tag;
op2->o_time = op->o_time;	op2->o_time = op->o_time;
op2->o_bd = op->o_bd;	op2->o_bd = on->on_info->oi_origdb;
op2->o_request = op->o_request;	op2->o_request = op->o_request;
	op2->o_private = on;

if ( i ) {	if ( i ) {
op2->ors_attrs = (AttributeName *)(op2->o_hdr + 1);	op2->ors_attrs = (AttributeName *)(op2->o_hdr + 1);
Line 1687 syncprov_detach_op( Operation *op, synco	Line 1770 syncprov_detach_op( Operation *op, synco
op2->ors_filterstr.bv_val = ptr;	op2->ors_filterstr.bv_val = ptr;
strcpy( ptr, so->s_filterstr.bv_val );	strcpy( ptr, so->s_filterstr.bv_val );
op2->ors_filterstr.bv_len = so->s_filterstr.bv_len;	op2->ors_filterstr.bv_len = so->s_filterstr.bv_len;
op2->ors_filter = str2filter( ptr );	op2->ors_filter = filter_dup( op->ors_filter, NULL );
so->s_op = op2;	so->s_op = op2;

/* Copy any cached group ACLs individually */	/* Copy any cached group ACLs individually */
Line 1709 syncprov_detach_op( Operation *op, synco	Line 1792 syncprov_detach_op( Operation *op, synco
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 );	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	static int
Line 1731 syncprov_search_response( Operation *op,	Line 1817 syncprov_search_response( Operation *op,
return SLAP_CB_CONTINUE;	return SLAP_CB_CONTINUE;
}	}
a = attr_find( rs->sr_entry->e_attrs, slap_schema.si_ad_entryCSN );	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 ) {	if ( a ) {
/* Make sure entry is less than the snaphot'd contextCSN */	/* Make sure entry is less than the snapshot'd contextCSN */
if ( ber_bvcmp( &a->a_nvals[0], &ss->ss_ctxcsn ) > 0 )	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 );
return LDAP_SUCCESS;	return LDAP_SUCCESS;
	}

/* Don't send the ctx entry twice */	/* Don't send the ctx entry twice */
if ( !BER_BVISNULL( &srs->sr_state.ctxcsn ) &&	if ( !BER_BVISNULL( &srs->sr_state.ctxcsn ) &&
bvmatch( &a->a_nvals[0], &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 );
return LDAP_SUCCESS;	return LDAP_SUCCESS;
	}
}	}
rs->sr_ctrls = op->o_tmpalloc( sizeof(LDAPControl )2,	rs->sr_ctrls = op->o_tmpalloc( sizeof(LDAPControl )2,
op->o_tmpmemctx );	op->o_tmpmemctx );
Line 1760 syncprov_search_response( Operation *op,	Line 1859 syncprov_search_response( Operation *op,
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_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 );
} else {	} else {
int locked = 0;
/* It's RefreshAndPersist, transition to Persist phase */	/* It's RefreshAndPersist, transition to Persist phase */
syncprov_sendinfo( op, rs, ( ss->ss_present && rs->sr_nentries ) ?	syncprov_sendinfo( op, rs, ( ss->ss_present && rs->sr_nentries ) ?
LDAP_TAG_SYNC_REFRESH_PRESENT : LDAP_TAG_SYNC_REFRESH_DELETE,	LDAP_TAG_SYNC_REFRESH_PRESENT : LDAP_TAG_SYNC_REFRESH_DELETE,
&cookie, 1, NULL, 0 );	&cookie, 1, NULL, 0 );
/* Flush any queued persist messages */	op->o_tmpfree( cookie.bv_val, op->o_tmpmemctx );
if ( ss->ss_so->s_res ) {
ldap_pvt_thread_mutex_lock( &ss->ss_so->s_mutex );	/* Detach this Op from frontend control */
locked = 1;	ldap_pvt_thread_mutex_lock( &ss->ss_so->s_mutex );
syncprov_qplay( op, on, ss->ss_so );
}

/* Turn off the refreshing flag */	/* Turn off the refreshing flag */
ss->ss_so->s_flags ^= PS_IS_REFRESHING;	ss->ss_so->s_flags ^= PS_IS_REFRESHING;
if ( locked )
ldap_pvt_thread_mutex_unlock( &ss->ss_so->s_mutex );

/* Detach this Op from frontend control */	syncprov_detach_op( op, ss->ss_so, on );
syncprov_detach_op( op, ss->ss_so );	ldap_pvt_thread_mutex_unlock( &ss->ss_so->s_mutex );

return LDAP_SUCCESS;	return LDAP_SUCCESS;
}	}
Line 1824 syncprov_op_search( Operation *op, SlapR	Line 1919 syncprov_op_search( Operation *op, SlapR
fc.fbase = 0;	fc.fbase = 0;
so.s_eid = NOID;	so.s_eid = NOID;
so.s_op = op;	so.s_op = op;
so.s_flags = PS_IS_REFRESHING;	so.s_flags = PS_IS_REFRESHING \| PS_FIND_BASE;
/* syncprov_findbase expects to be called as a callback... */	/* syncprov_findbase expects to be called as a callback... */
sc.sc_private = &opc;	sc.sc_private = &opc;
opc.son = on;	opc.son = on;
	ldap_pvt_thread_mutex_init( &so.s_mutex );
cb = op->o_callback;	cb = op->o_callback;
op->o_callback = &sc;	op->o_callback = &sc;
rs->sr_err = syncprov_findbase( op, &fc );	rs->sr_err = syncprov_findbase( op, &fc );
op->o_callback = cb;	op->o_callback = cb;
	ldap_pvt_thread_mutex_destroy( &so.s_mutex );

if ( rs->sr_err != LDAP_SUCCESS ) {	if ( rs->sr_err != LDAP_SUCCESS ) {
send_ldap_result( op, rs );	send_ldap_result( op, rs );
Line 1887 syncprov_op_search( Operation *op, SlapR	Line 1984 syncprov_op_search( Operation *op, SlapR
if ( ber_bvcmp( &srs->sr_state.ctxcsn, &sl->sl_mincsn ) >= 0 ) {	if ( ber_bvcmp( &srs->sr_state.ctxcsn, &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->sr_state.ctxcsn, &ctxcsn );	syncprov_playlog( op, rs, sl, srs, &ctxcsn );
} else {	} else {
ldap_pvt_thread_mutex_unlock( &sl->sl_mutex );	ldap_pvt_thread_mutex_unlock( &sl->sl_mutex );
}	}
Line 1895 syncprov_op_search( Operation *op, SlapR	Line 1992 syncprov_op_search( Operation *op, SlapR
/* Is the CSN still present in the database? */	/* Is the CSN still present in the database? */
if ( syncprov_findcsn( op, FIND_CSN ) != LDAP_SUCCESS ) {	if ( syncprov_findcsn( op, FIND_CSN ) != LDAP_SUCCESS ) {
/* No, so a reload is required */	/* No, so a reload is required */
#if 0 /* the consumer doesn't seem to send this hint */	/* the 2.2 consumer doesn't send this hint */
if ( op->o_sync_rhint == 0 ) {	if ( si->si_usehint && srs->sr_rhint == 0 ) {
send_ldap_error( op, rs, LDAP_SYNC_REFRESH_REQUIRED, "sync cookie is stale" );	send_ldap_error( op, rs, LDAP_SYNC_REFRESH_REQUIRED, "sync cookie is stale" );
return rs->sr_err;	return rs->sr_err;
}	}
#endif
} 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 2021 syncprov_operational(	Line 2117 syncprov_operational(
enum {	enum {
SP_CHKPT = 1,	SP_CHKPT = 1,
SP_SESSL,	SP_SESSL,
SP_NOPRES	SP_NOPRES,
	SP_USEHINT
};	};

static ConfigDriver sp_cf_gen;	static ConfigDriver sp_cf_gen;
Line 2039 static ConfigTable spcfg[] = {	Line 2136 static ConfigTable spcfg[] = {
sp_cf_gen, "( OLcfgOvAt:1.3 NAME 'olcSpNoPresent' "	sp_cf_gen, "( OLcfgOvAt:1.3 NAME 'olcSpNoPresent' "
"DESC 'Omit Present phase processing' "	"DESC 'Omit Present phase processing' "
"SYNTAX OMsBoolean SINGLE-VALUE )", NULL, NULL },	"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 }	{ NULL, NULL, 0, 0, 0, ARG_IGNORED }
};	};

Line 2086 sp_cf_gen(ConfigArgs *c)	Line 2187 sp_cf_gen(ConfigArgs *c)
rc = 1;	rc = 1;
}	}
break;	break;
	case SP_USEHINT:
	if ( si->si_usehint ) {
	c->value_int = 1;
	} else {
	rc = 1;
	}
	break;
}	}
return rc;	return rc;
} else if ( c->op == LDAP_MOD_DELETE ) {	} else if ( c->op == LDAP_MOD_DELETE ) {
Line 2106 sp_cf_gen(ConfigArgs *c)	Line 2214 sp_cf_gen(ConfigArgs *c)
else	else
rc = LDAP_NO_SUCH_ATTRIBUTE;	rc = LDAP_NO_SUCH_ATTRIBUTE;
break;	break;
	case SP_USEHINT:
	if ( si->si_usehint )
	si->si_usehint = 0;
	else
	rc = LDAP_NO_SUCH_ATTRIBUTE;
	break;
}	}
return rc;	return rc;
}	}
switch ( c->type ) {	switch ( c->type ) {
case SP_CHKPT:	case SP_CHKPT:
si->si_chkops = atoi( c->argv[1] );	if ( lutil_atoi( &si->si_chkops, c->argv[1] ) != 0 ) {
si->si_chktime = atoi( c->argv[2] ) * 60;	sprintf( c->msg, "%s unable to parse checkpoint ops # \"%s\"",
	c->argv[0], c->argv[1] );
	Debug( LDAP_DEBUG_CONFIG, "%s: %s\n", c->log, c->msg, 0 );
	return ARG_BAD_CONF;
	}
	if ( si->si_chkops <= 0 ) {
	sprintf( c->msg, "%s invalid checkpoint ops # \"%d\"",
	c->argv[0], si->si_chkops );
	Debug( LDAP_DEBUG_CONFIG, "%s: %s\n", c->log, c->msg, 0 );
	return ARG_BAD_CONF;
	}
	if ( lutil_atoi( &si->si_chktime, c->argv[2] ) != 0 ) {
	sprintf( c->msg, "%s unable to parse checkpoint time \"%s\"",
	c->argv[0], c->argv[1] );
	Debug( LDAP_DEBUG_CONFIG, "%s: %s\n", c->log, c->msg, 0 );
	return ARG_BAD_CONF;
	}
	if ( si->si_chktime <= 0 ) {
	sprintf( c->msg, "%s invalid checkpoint time \"%d\"",
	c->argv[0], si->si_chkops );
	Debug( LDAP_DEBUG_CONFIG, "%s: %s\n", c->log, c->msg, 0 );
	return ARG_BAD_CONF;
	}
	si->si_chktime *= 60;
break;	break;
case SP_SESSL: {	case SP_SESSL: {
sessionlog *sl;	sessionlog *sl;
Line 2140 sp_cf_gen(ConfigArgs *c)	Line 2277 sp_cf_gen(ConfigArgs *c)
case SP_NOPRES:	case SP_NOPRES:
si->si_nopres = c->value_int;	si->si_nopres = c->value_int;
break;	break;
	case SP_USEHINT:
	si->si_usehint = c->value_int;
	break;
}	}
return rc;	return rc;
}	}
Line 2168 syncprov_db_open(	Line 2308 syncprov_db_open(
slap_overinst on = (slap_overinst ) be->bd_info;	slap_overinst on = (slap_overinst ) be->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;

Connection conn;	Connection conn = { 0 };
char opbuf[OPERATION_BUFFER_SIZE];	OperationBuffer opbuf = { 0 };
char ctxcsnbuf[LDAP_LUTIL_CSNSTR_BUFSIZE];	char ctxcsnbuf[LDAP_LUTIL_CSNSTR_BUFSIZE];
Operation op = (Operation )opbuf;	Operation op = (Operation ) &opbuf;
Entry *e;	Entry *e;
Attribute *a;	Attribute *a;
int rc;	int rc;
Line 2212 syncprov_db_open(	Line 2352 syncprov_db_open(
strcpy( ctxcsnbuf, si->si_ctxcsnbuf );	strcpy( ctxcsnbuf, si->si_ctxcsnbuf );
}	}
be_entry_release_rw( op, e, 0 );	be_entry_release_rw( op, e, 0 );
op->o_bd->bd_info = (BackendInfo *)on;	if ( !BER_BVISEMPTY( &si->si_ctxcsn ) ) {
op->o_req_dn = be->be_suffix[0];	op->o_bd->bd_info = (BackendInfo *)on;
op->o_req_ndn = be->be_nsuffix[0];	op->o_req_dn = be->be_suffix[0];
op->ors_scope = LDAP_SCOPE_SUBTREE;	op->o_req_ndn = be->be_nsuffix[0];
ldap_pvt_thread_create( &tid, 0, syncprov_db_otask, op );	op->ors_scope = LDAP_SCOPE_SUBTREE;
ldap_pvt_thread_join( tid, NULL );	ldap_pvt_thread_create( &tid, 0, syncprov_db_otask, op );
	ldap_pvt_thread_join( tid, NULL );
	}
} else if ( SLAP_SYNC_SHADOW( op->o_bd )) {	} else if ( SLAP_SYNC_SHADOW( op->o_bd )) {
/* If we're also a consumer, and we didn't find the context entry,	/* 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	* then don't generate anything, wait for our provider to send it
Line 2227 syncprov_db_open(	Line 2369 syncprov_db_open(
}	}

if ( BER_BVISEMPTY( &si->si_ctxcsn ) ) {	if ( BER_BVISEMPTY( &si->si_ctxcsn ) ) {
slap_get_csn( op, si->si_ctxcsnbuf, sizeof(si->si_ctxcsnbuf),	si->si_ctxcsn.bv_len = sizeof( si->si_ctxcsnbuf );
&si->si_ctxcsn, 0 );	slap_get_csn( op, &si->si_ctxcsn, 0 );
}	}

/* If our ctxcsn is different from what was read from the root	/* If our ctxcsn is different from what was read from the root
Line 2259 syncprov_db_close(	Line 2401 syncprov_db_close(
}	}
if ( si->si_numops ) {	if ( si->si_numops ) {
Connection conn;	Connection conn;
char opbuf[OPERATION_BUFFER_SIZE];	OperationBuffer opbuf;
Operation op = (Operation )opbuf;	Operation op = (Operation ) &opbuf;
SlapReply rs = {REP_RESULT};	SlapReply rs = {REP_RESULT};
void *thrctx;	void *thrctx;

Line 2311 syncprov_db_destroy(	Line 2453 syncprov_db_destroy(
syncprov_info_t si = (syncprov_info_t )on->on_bi.bi_private;	syncprov_info_t si = (syncprov_info_t )on->on_bi.bi_private;

if ( si ) {	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_mods_mutex );
ldap_pvt_thread_mutex_destroy( &si->si_ops_mutex );	ldap_pvt_thread_mutex_destroy( &si->si_ops_mutex );
ldap_pvt_thread_mutex_destroy( &si->si_csn_mutex );	ldap_pvt_thread_mutex_destroy( &si->si_csn_mutex );
Line 2387 static int syncprov_parseCtrl (	Line 2540 static int syncprov_parseCtrl (
rs->sr_text = "Sync control : cookie decoding error";	rs->sr_text = "Sync control : cookie decoding error";
return LDAP_PROTOCOL_ERROR;	return LDAP_PROTOCOL_ERROR;
}	}
	tag = ber_peek_tag( ber, &len );
}	}
if ( tag == LDAP_TAG_RELOAD_HINT ) {	if ( tag == LDAP_TAG_RELOAD_HINT ) {
if (( ber_scanf( ber, /{/ "b", &rhint )) == LBER_ERROR ) {	if (( ber_scanf( ber, /{/ "b", &rhint )) == LBER_ERROR ) {
Line 2428 static int syncprov_parseCtrl (	Line 2582 static int syncprov_parseCtrl (
static slap_overinst syncprov;	static slap_overinst syncprov;

int	int
syncprov_init()	syncprov_initialize()
{	{
int rc;	int rc;

rc = register_supported_control( LDAP_CONTROL_SYNC,	rc = register_supported_control( LDAP_CONTROL_SYNC,
SLAP_CTRL_HIDE\|SLAP_CTRL_SEARCH, NULL,	SLAP_CTRL_SEARCH, NULL,
syncprov_parseCtrl, &slap_cids.sc_LDAPsync );	syncprov_parseCtrl, &slap_cids.sc_LDAPsync );
if ( rc != LDAP_SUCCESS ) {	if ( rc != LDAP_SUCCESS ) {
Debug( LDAP_DEBUG_ANY,	Debug( LDAP_DEBUG_ANY,
Line 2461 syncprov_init()	Line 2615 syncprov_init()

syncprov.on_bi.bi_cf_ocs = spocs;	syncprov.on_bi.bi_cf_ocs = spocs;

	generic_filter.f_desc = slap_schema.si_ad_objectClass;

rc = config_register_schema( spcfg, spocs );	rc = config_register_schema( spcfg, spocs );
if ( rc ) return rc;	if ( rc ) return rc;

Line 2471 syncprov_init()	Line 2627 syncprov_init()
int	int
init_module( int argc, char *argv[] )	init_module( int argc, char *argv[] )
{	{
return syncprov_init();	return syncprov_initialize();
}	}
#endif /* SLAPD_OVER_SYNCPROV == SLAPD_MOD_DYNAMIC */	#endif /* SLAPD_OVER_SYNCPROV == SLAPD_MOD_DYNAMIC */

Removed from v.1.56.2.15
changed lines
	Added in v.1.56.2.32