/* $OpenLDAP$ */
/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
*
- * Copyright 1998-2007 The OpenLDAP Foundation.
+ * Copyright 1998-2009 The OpenLDAP Foundation.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
}
#endif /* defined( LDAP_SLAPI ) */
+ if ( !BER_BVISNULL( &op->o_csn ) ) {
+ op->o_tmpfree( op->o_csn.bv_val, op->o_tmpmemctx );
+ BER_BVZERO( &op->o_csn );
+ }
+
opbuf = (OperationBuffer *) op;
memset( opbuf, 0, sizeof(*opbuf) );
op->o_hdr = &opbuf->ob_hdr;
op->o_controls = opbuf->ob_controls;
if ( ctx ) {
- Operation *op2;
- void *otmp = NULL;
- ldap_pvt_thread_pool_getkey( ctx, (void *)slap_op_free, &otmp, NULL );
- op2 = otmp;
+ void *op2 = NULL;
+ ldap_pvt_thread_pool_setkey( ctx, (void *)slap_op_free,
+ op, slap_op_q_destroy, &op2, NULL );
LDAP_STAILQ_NEXT( op, o_next ) = op2;
- ldap_pvt_thread_pool_setkey( ctx, (void *)slap_op_free, (void *)op,
- slap_op_q_destroy );
} else {
ber_memfree_x( op, NULL );
}
void
slap_op_time(time_t *t, int *nop)
{
- *t = slap_get_time();
ldap_pvt_thread_mutex_lock( &slap_op_mutex );
+ *t = slap_get_time();
if ( *t == last_time ) {
*nop = ++last_incr;
} else {
if ( otmp ) {
op = otmp;
otmp = LDAP_STAILQ_NEXT( op, o_next );
- ldap_pvt_thread_pool_setkey( ctx, (void *)slap_op_free, otmp,
- slap_op_q_destroy );
+ ldap_pvt_thread_pool_setkey( ctx, (void *)slap_op_free,
+ otmp, slap_op_q_destroy, NULL, NULL );
}
}
if (!op) {