From: Howard Chu <hyc@openldap.org>
Date: Sat, 27 Jan 2007 18:38:24 +0000 (+0000)
Subject: Partially revert prev commit, just omit the sl_mem_destroy
X-Git-Tag: OPENLDAP_REL_ENG_2_4_4ALPHA~8^2~118
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=f92dc7b5faaab39fc7659db754e07e9e78de3596;p=openldap

Partially revert prev commit, just omit the sl_mem_destroy
---

diff --git a/servers/slapd/back-monitor/init.c b/servers/slapd/back-monitor/init.c
index b37a21b43f..978d1301c8 100644
--- a/servers/slapd/back-monitor/init.c
+++ b/servers/slapd/back-monitor/init.c
@@ -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;