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.201 and 1.202

version 1.201, 2007/09/29 15:55:33	version 1.202, 2007/10/02 16:09:15
Line 1	Line 1
/* $OpenLDAP: pkg/ldap/servers/slapd/overlays/syncprov.c,v 1.200 2007/09/24 03:02:32 hyc Exp $ */	/* $OpenLDAP: pkg/ldap/servers/slapd/overlays/syncprov.c,v 1.201 2007/09/29 15:55:33 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 776 syncprov_sendresp( Operation *op, opcook	Line 776 syncprov_sendresp( Operation *op, opcook
BER_BVZERO( &csns[1] );	BER_BVZERO( &csns[1] );
slap_compose_sync_cookie( op, &cookie, csns, so->s_rid, so->s_sid );	slap_compose_sync_cookie( op, &cookie, csns, so->s_rid, so->s_sid );

	Debug( LDAP_DEBUG_SYNC, "syncprov_sendresp: cookie=%s\n", cookie.bv_val, 0, 0 );

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;
Line 1533 syncprov_playlog( Operation *op, SlapRep	Line 1535 syncprov_playlog( Operation *op, SlapRep

slap_compose_sync_cookie( op, &cookie, delcsn, srs->sr_state.rid,	slap_compose_sync_cookie( op, &cookie, delcsn, srs->sr_state.rid,
srs->sr_state.sid );	srs->sr_state.sid );

	Debug( LDAP_DEBUG_SYNC, "syncprov_playlog: cookie=%s\n", cookie.bv_val, 0, 0 );

uuids[ndel].bv_val = NULL;	uuids[ndel].bv_val = NULL;
syncprov_sendinfo( op, rs, LDAP_TAG_SYNC_ID_SET, &cookie, 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( cookie.bv_val, op->o_tmpmemctx );
Line 1986 syncprov_search_response( Operation *op,	Line 1991 syncprov_search_response( Operation *op,
slap_compose_sync_cookie( op, &cookie, ss->ss_ctxcsn,	slap_compose_sync_cookie( op, &cookie, ss->ss_ctxcsn,
srs->sr_state.rid, srs->sr_state.sid );	srs->sr_state.rid, srs->sr_state.sid );

	Debug( LDAP_DEBUG_SYNC, "syncprov_search_response: cookie=%s\n", cookie.bv_val, 0, 0 );

/* Is this a regular refresh? */	/* Is this a regular refresh? */
if ( !ss->ss_so ) {	if ( !ss->ss_so ) {
rs->sr_ctrls = op->o_tmpalloc( sizeof(LDAPControl )2,	rs->sr_ctrls = op->o_tmpalloc( sizeof(LDAPControl )2,

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