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.42 and 1.147.2.43

version 1.147.2.42, 2009/01/22 00:01:13	version 1.147.2.43, 2009/01/26 20:53:59
Line 1	Line 1
/* $OpenLDAP: pkg/ldap/servers/slapd/overlays/syncprov.c,v 1.147.2.41 2008/11/23 21:36:52 hyc Exp $ */	/* $OpenLDAP: pkg/ldap/servers/slapd/overlays/syncprov.c,v 1.147.2.42 2009/01/22 00:01:13 kurt 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 800 syncprov_sendresp( Operation *op, opcook	Line 800 syncprov_sendresp( Operation *op, opcook
rs.sr_entry = *e;	rs.sr_entry = *e;
if ( rs.sr_entry->e_private )	if ( rs.sr_entry->e_private )
rs.sr_flags = REP_ENTRY_MUSTRELEASE;	rs.sr_flags = REP_ENTRY_MUSTRELEASE;
if ( opc->sreference ) {	if ( opc->sreference && so->s_op->o_managedsait <= SLAP_CONTROL_IGNORED ) {
rs.sr_ref = get_entry_referrals( op, rs.sr_entry );	rs.sr_ref = get_entry_referrals( op, rs.sr_entry );
rs.sr_err = send_search_reference( op, &rs );	rs.sr_err = send_search_reference( op, &rs );
ber_bvarray_free( rs.sr_ref );	ber_bvarray_free( rs.sr_ref );
Line 823 syncprov_sendresp( Operation *op, opcook	Line 823 syncprov_sendresp( Operation *op, opcook
e_uuid.e_name = opc->sdn;	e_uuid.e_name = opc->sdn;
e_uuid.e_nname = opc->sndn;	e_uuid.e_nname = opc->sndn;
rs.sr_entry = &e_uuid;	rs.sr_entry = &e_uuid;
if ( opc->sreference ) {	if ( opc->sreference && so->s_op->o_managedsait <= SLAP_CONTROL_IGNORED ) {
struct berval bv = BER_BVNULL;	struct berval bv = BER_BVNULL;
rs.sr_ref = &bv;	rs.sr_ref = &bv;
rs.sr_err = send_search_reference( op, &rs );	rs.sr_err = send_search_reference( op, &rs );
Line 1949 syncprov_detach_op( Operation *op, synco	Line 1949 syncprov_detach_op( Operation *op, synco
op2->o_time = op->o_time;	op2->o_time = op->o_time;
op2->o_bd = on->on_info->oi_origdb;	op2->o_bd = on->on_info->oi_origdb;
op2->o_request = op->o_request;	op2->o_request = op->o_request;
	op2->o_managedsait = op->o_managedsait;
LDAP_SLIST_FIRST(&op2->o_extra)->oe_key = on;	LDAP_SLIST_FIRST(&op2->o_extra)->oe_key = on;
LDAP_SLIST_NEXT(LDAP_SLIST_FIRST(&op2->o_extra), oe_next) = NULL;	LDAP_SLIST_NEXT(LDAP_SLIST_FIRST(&op2->o_extra), oe_next) = NULL;

Line 2175 syncprov_op_search( Operation *op, SlapR	Line 2176 syncprov_op_search( Operation *op, SlapR
}	}

srs = op->o_controls[slap_cids.sc_LDAPsync];	srs = op->o_controls[slap_cids.sc_LDAPsync];
op->o_managedsait = SLAP_CONTROL_NONCRITICAL;

/* If this is a persistent search, set it up right away */	/* If this is a persistent search, set it up right away */
if ( op->o_sync_mode & SLAP_SYNC_PERSIST ) {	if ( op->o_sync_mode & SLAP_SYNC_PERSIST ) {

Removed from v.1.147.2.42
changed lines
	Added in v.1.147.2.43