From: Howard Chu <hyc@openldap.org>
Date: Thu, 25 Jan 2007 10:33:28 +0000 (+0000)
Subject: Don't muck with sl_mem
X-Git-Tag: OPENLDAP_REL_ENG_2_4_4ALPHA~8^2~141
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=2ec71598cd1ec233d59f6fbdf393bda1ade8ff9f;p=openldap

Don't muck with sl_mem
---

diff --git a/servers/slapd/back-monitor/init.c b/servers/slapd/back-monitor/init.c
index 310770fc44..b37a21b43f 100644
--- a/servers/slapd/back-monitor/init.c
+++ b/servers/slapd/back-monitor/init.c
@@ -723,14 +723,6 @@ monitor_search2ndn(
 
 	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;
 	if ( nbase == NULL || BER_BVISNULL( nbase ) ) {
 		ber_dupbv_x( &op->o_req_dn, &op->o_bd->be_suffix[ 0 ],
@@ -777,12 +769,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_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 ( !BER_BVISNULL( &op->o_req_dn ) ) {
+		op->o_tmpfree( op->o_req_dn.bv_val, op->o_tmpmemctx );
+	}
 
 	if ( rc != 0 ) {
 		return rc;