Commit f92dc7b5 authored by Howard Chu's avatar Howard Chu
Browse files

Partially revert prev commit, just omit the sl_mem_destroy

parent beeede6c
......@@ -723,6 +723,12 @@ monitor_search2ndn(
op->o_tag = LDAP_REQ_SEARCH;
/* use global malloc for now */
if ( op->o_tmpmemctx ) {
op->o_tmpmemctx = NULL;
}
op->o_tmpmfuncs = &ch_mfuncs;
op->o_bd = be_monitor;
if ( nbase == NULL || BER_BVISNULL( nbase ) ) {
ber_dupbv_x( &op->o_req_dn, &op->o_bd->be_suffix[ 0 ],
......@@ -769,12 +775,12 @@ cleanup:;
if ( !BER_BVISNULL( &op->ors_filterstr ) ) {
op->o_tmpfree( op->ors_filterstr.bv_val, op->o_tmpmemctx );
}
if ( !BER_BVISNULL( &op->o_req_ndn ) ) {
op->o_tmpfree( op->o_req_ndn.bv_val, op->o_tmpmemctx );
}
if ( !BER_BVISNULL( &op->o_req_dn ) ) {
op->o_tmpfree( op->o_req_dn.bv_val, op->o_tmpmemctx );
}
if ( !BER_BVISNULL( &op->o_req_ndn ) ) {
op->o_tmpfree( op->o_req_ndn.bv_val, op->o_tmpmemctx );
}
if ( rc != 0 ) {
return rc;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment