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.126 and 1.127

version 1.126, 2005/11/16 14:58:18	version 1.127, 2005/11/20 09:39:05
Line 1	Line 1
/* $OpenLDAP: pkg/ldap/servers/slapd/overlays/syncprov.c,v 1.125 2005/11/15 17:27:40 ando Exp $ */	/* $OpenLDAP: pkg/ldap/servers/slapd/overlays/syncprov.c,v 1.126 2005/11/16 14:58:18 ando 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/>.
*	*
Line 583 syncprov_findcsn( Operation *op, find_cs	Line 583 syncprov_findcsn( Operation *op, find_cs
#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 637 again:	Line 637 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 1244 syncprov_checkpoint( Operation *op, Slap	Line 1246 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;
	SLAP_DBFLAGS( opm.o_bd ) \|= SLAP_DBFLAG_NOLASTMOD;
opm.o_bd->be_modify( &opm, &rsm );	opm.o_bd->be_modify( &opm, &rsm );
	SLAP_DBFLAGS( opm.o_bd ) ^= SLAP_DBFLAG_NOLASTMOD;
if ( mod.sml_next != NULL ) {	if ( mod.sml_next != NULL ) {
slap_mods_free( mod.sml_next, 1 );	slap_mods_free( mod.sml_next, 1 );
}	}

Removed from v.1.126
changed lines
	Added in v.1.127