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.17 and 1.147.2.18

version 1.147.2.17, 2008/02/12 00:43:33	version 1.147.2.18, 2008/02/12 00:50:44
Line 1	Line 1
/* $OpenLDAP: pkg/ldap/servers/slapd/overlays/syncprov.c,v 1.147.2.16 2008/02/11 23:26:49 kurt Exp $ */	/* $OpenLDAP: pkg/ldap/servers/slapd/overlays/syncprov.c,v 1.147.2.17 2008/02/12 00:43:33 quanah 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 1566 syncprov_op_response( Operation *op, Sla	Line 1566 syncprov_op_response( Operation *op, Sla
char cbuf[LDAP_LUTIL_CSNSTR_BUFSIZE];	char cbuf[LDAP_LUTIL_CSNSTR_BUFSIZE];
int do_check = 0, have_psearches;	int do_check = 0, have_psearches;

/* Don't do any processing for consumer contextCSN updates */
if ( SLAP_SYNC_SHADOW( op->o_bd ) &&
op->o_msgid == SLAP_SYNC_UPDATE_MSGID ) {
return SLAP_CB_CONTINUE;
}

/* Update our context CSN */	/* Update our context CSN */
cbuf[0] = '\0';	cbuf[0] = '\0';
ldap_pvt_thread_rdwr_wlock( &si->si_csn_rwlock );	ldap_pvt_thread_rdwr_wlock( &si->si_csn_rwlock );
Line 1598 syncprov_op_response( Operation *op, Sla	Line 1592 syncprov_op_response( Operation *op, Sla
}	}
}	}

	/* Don't do any processing for consumer contextCSN updates */
	if ( SLAP_SYNC_SHADOW( op->o_bd ) &&
	op->o_msgid == SLAP_SYNC_UPDATE_MSGID ) {
	ldap_pvt_thread_rdwr_wunlock( &si->si_csn_rwlock );
	return SLAP_CB_CONTINUE;
	}

si->si_numops++;	si->si_numops++;
if ( si->si_chkops \|\| si->si_chktime ) {	if ( si->si_chkops \|\| si->si_chktime ) {
if ( si->si_chkops && si->si_numops >= si->si_chkops ) {	if ( si->si_chkops && si->si_numops >= si->si_chkops ) {

Removed from v.1.147.2.17
changed lines
	Added in v.1.147.2.18