mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-01-06 10:46:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

Don't muck with sl_mem

Browse Source
This commit is contained in:
Howard Chu 2007-01-25 10:33:28 +00:00
parent 540878020a
commit 2ec71598cd
1 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
servers/slapd/back-monitor/init.c
View File

@ -723,14 +723,6 @@ monitor_search2ndn(
op->o_tag = LDAP_REQ_SEARCH; op->o_tag = LDAP_REQ_SEARCH;
/* use global malloc for now */
if ( op->o_tmpmemctx ) {
/* FIXME: connection_fake_init() calls slap_sl_mem_create, so we destroy it for now */
slap_sl_mem_destroy( NULL, op->o_tmpmemctx );
op->o_tmpmemctx = NULL;
}
op->o_tmpmfuncs = &ch_mfuncs;
op->o_bd = be_monitor; op->o_bd = be_monitor;
if ( nbase == NULL || BER_BVISNULL( nbase ) ) { if ( nbase == NULL || BER_BVISNULL( nbase ) ) {
ber_dupbv_x( &op->o_req_dn, &op->o_bd->be_suffix[ 0 ], ber_dupbv_x( &op->o_req_dn, &op->o_bd->be_suffix[ 0 ],
@ -777,12 +769,12 @@ cleanup:;
if ( !BER_BVISNULL( &op->ors_filterstr ) ) { if ( !BER_BVISNULL( &op->ors_filterstr ) ) {
op->o_tmpfree( op->ors_filterstr.bv_val, op->o_tmpmemctx ); op->o_tmpfree( op->ors_filterstr.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 ) ) { if ( !BER_BVISNULL( &op->o_req_ndn ) ) {
op->o_tmpfree( op->o_req_ndn.bv_val, op->o_tmpmemctx ); 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 ( rc != 0 ) { if ( rc != 0 ) {
return rc; return rc;