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.202 and 1.203

version 1.202, 2007/10/02 16:09:15	version 1.203, 2007/10/02 21:51:40
Line 1	Line 1
/* $OpenLDAP: pkg/ldap/servers/slapd/overlays/syncprov.c,v 1.201 2007/09/29 15:55:33 ando Exp $ */	/* $OpenLDAP: pkg/ldap/servers/slapd/overlays/syncprov.c,v 1.202 2007/10/02 16:09:15 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 982 static int	Line 982 static int
syncprov_qresp( opcookie opc, syncops so, int mode )	syncprov_qresp( opcookie opc, syncops so, int mode )
{	{
syncres *sr;	syncres *sr;
int sid;	int sid, srsize;

/* Don't send changes back to their originator */	/* Don't send changes back to their originator */
sid = slap_parse_csn_sid( &opc->sctxcsn );	sid = slap_parse_csn_sid( &opc->sctxcsn );
if ( sid >= 0 && sid == so->s_sid )	if ( sid >= 0 && sid == so->s_sid )
return LDAP_SUCCESS;	return LDAP_SUCCESS;

sr = ch_malloc(sizeof(syncres) + opc->suuid.bv_len + 1 +	srsize = sizeof(syncres) + opc->suuid.bv_len + 1 +
opc->sdn.bv_len + 1 + opc->sndn.bv_len + 1 + opc->sctxcsn.bv_len + 1 );	opc->sdn.bv_len + 1 + opc->sndn.bv_len + 1;
	if ( opc->sctxcsn.bv_len )
	srsize += opc->sctxcsn.bv_len + 1;
	sr = ch_malloc( srsize );
sr->s_next = NULL;	sr->s_next = NULL;
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;
Line 1003 syncprov_qresp( opcookie opc, syncops	Line 1006 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 );
sr->s_csn.bv_val = sr->s_uuid.bv_val + sr->s_uuid.bv_len + 1;	if ( opc->sctxcsn.bv_len ) {
	sr->s_csn.bv_val = sr->s_uuid.bv_val + sr->s_uuid.bv_len + 1;
	strcpy( sr->s_csn.bv_val, opc->sctxcsn.bv_val );
	} else {
	sr->s_csn.bv_val = NULL;
	}
sr->s_csn.bv_len = opc->sctxcsn.bv_len;	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 );
if ( !so->s_res ) {	if ( !so->s_res ) {

Removed from v.1.202
changed lines
	Added in v.1.203