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.72 and 1.147.2.73

version 1.147.2.72, 2010/04/14 17:56:12	version 1.147.2.73, 2010/04/19 16:53:04
Line 591 syncprov_findcsn( Operation *op, find_cs	Line 591 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_LUTIL_CSNSTR_BUFSIZE + STRLENOF("(entryCSN<=)")];	char buf[LDAP_PVT_CSNSTR_BUFSIZE + STRLENOF("(entryCSN<=)")];
char cbuf[LDAP_LUTIL_CSNSTR_BUFSIZE];	char cbuf[LDAP_PVT_CSNSTR_BUFSIZE];
struct berval maxcsn;	struct berval maxcsn;
Filter cf;	Filter cf;
AttributeAssertion eq = ATTRIBUTEASSERTION_INIT;	AttributeAssertion eq = ATTRIBUTEASSERTION_INIT;
Line 1535 syncprov_playlog( Operation *op, SlapRep	Line 1535 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_LUTIL_CSNSTR_BUFSIZE];	char cbuf[LDAP_PVT_CSNSTR_BUFSIZE];
BerVarray uuids;	BerVarray uuids;
struct berval delcsn[2];	struct berval delcsn[2];

Line 1710 syncprov_op_response( Operation *op, Sla	Line 1710 syncprov_op_response( Operation *op, Sla
if ( rs->sr_err == LDAP_SUCCESS )	if ( rs->sr_err == LDAP_SUCCESS )
{	{
struct berval maxcsn;	struct berval maxcsn;
char cbuf[LDAP_LUTIL_CSNSTR_BUFSIZE];	char cbuf[LDAP_PVT_CSNSTR_BUFSIZE];
int do_check = 0, have_psearches, foundit, csn_changed = 0;	int do_check = 0, have_psearches, foundit, csn_changed = 0;

ldap_pvt_thread_mutex_lock( &si->si_resp_mutex );	ldap_pvt_thread_mutex_lock( &si->si_resp_mutex );
Line 2860 sp_cf_gen(ConfigArgs *c)	Line 2860 sp_cf_gen(ConfigArgs *c)
}	}
sl = si->si_logs;	sl = si->si_logs;
if ( !sl ) {	if ( !sl ) {
sl = ch_malloc( sizeof( sessionlog ) + LDAP_LUTIL_CSNSTR_BUFSIZE );	sl = ch_malloc( sizeof( sessionlog ) + LDAP_PVT_CSNSTR_BUFSIZE );
sl->sl_mincsn.bv_val = (char *)(sl+1);	sl->sl_mincsn.bv_val = (char *)(sl+1);
sl->sl_mincsn.bv_len = 0;	sl->sl_mincsn.bv_len = 0;
sl->sl_num = 0;	sl->sl_num = 0;
Line 2966 syncprov_db_open(	Line 2966 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_LUTIL_CSNSTR_BUFSIZE ];	char csnbuf[ LDAP_PVT_CSNSTR_BUFSIZE ];
struct berval csn;	struct berval csn;

if ( SLAP_SYNC_SHADOW( op->o_bd )) {	if ( SLAP_SYNC_SHADOW( op->o_bd )) {

Removed from v.1.147.2.72
changed lines
	Added in v.1.147.2.73