upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2026-02-19 02:28:47 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into mdb

Browse source
This commit is contained in:
Howard Chu 2011-08-16 13:54:30 -07:00
commit af5587258d
2 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
servers/slapd/operation.c
View file

@ -113,23 +113,27 @@ slap_op_free( Operation *op, void *ctx )
if ( !BER_BVISNULL( &op->o_csn ) ) {
op->o_tmpfree( op->o_csn.bv_val, op->o_tmpmemctx );
BER_BVZERO( &op->o_csn );
}
if ( op->o_pagedresults_state != NULL ) {
op->o_tmpfree( op->o_pagedresults_state, op->o_tmpmemctx );
op->o_pagedresults_state = NULL;
}
/* Selectively zero out the struct. Ignore fields that will
* get explicitly initialized later anyway. Keep o_abandon intact.
*/
opbuf = (OperationBuffer *) op;
memset( opbuf, 0, sizeof(*opbuf) );
op->o_hdr = &opbuf->ob_hdr;
op->o_bd = NULL;
BER_BVZERO( &op->o_req_dn );
BER_BVZERO( &op->o_req_ndn );
memset( &op->o_request, 0, sizeof( op->o_request ));
memset( &op->o_do_not_cache, 0, sizeof( Operation ) - offsetof( Operation, o_do_not_cache ));
op->o_controls = opbuf->ob_controls;
if ( ctx ) {
Operation *op2 = NULL;
ldap_pvt_thread_pool_setkey( ctx, (void *)slap_op_free,
op, slap_op_q_destroy, &op2, NULL );
op, slap_op_q_destroy, (void **)&op2, NULL );
LDAP_STAILQ_NEXT( op, o_next ) = op2;
if ( op2 ) {
op->o_tincr = op2->o_tincr + 1;
@ -180,6 +184,8 @@ slap_op_alloc(
otmp = LDAP_STAILQ_NEXT( op, o_next );
ldap_pvt_thread_pool_setkey( ctx, (void *)slap_op_free,
otmp, slap_op_q_destroy, NULL, NULL );
op->o_abandon = 0;
op->o_cancel = 0;
}
}
if (!op) {
@ -194,7 +200,6 @@ slap_op_alloc(
slap_op_time( &op->o_time, &op->o_tincr );
op->o_opid = id;
op->o_res_ber = NULL;
#if defined( LDAP_SLAPI )
if ( slapi_plugins_used ) {

4
servers/slapd/overlays/syncprov.c
View file

@ -1304,12 +1304,10 @@ syncprov_matchops( Operation *op, opcookie *opc, int saveit )
op2.o_extra = op->o_extra;
op2.o_callback = NULL;
if (ss->s_flags & PS_FIX_FILTER) {
Filter *f;
/* Skip the AND/GE clause that we stuck on in front. We
would lose deletes/mods that happen during the refresh
phase otherwise (ITS#6555) */
f = ss->s_op->ors_filter->f_and->f_next;
if ( f ) op2.ors_filter = f;
op2.ors_filter = ss->s_op->ors_filter->f_and->f_next;
}
ldap_pvt_thread_mutex_unlock( &ss->s_mutex );
rc = test_filter( &op2, e, op2.ors_filter );