From: Howard Chu <hyc@openldap.org>
Date: Tue, 19 Aug 2003 03:19:07 +0000 (+0000)
Subject: Fix tmpmemctx conflicts
X-Git-Tag: OPENLDAP_REL_ENG_2_1_MP~791
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=f1b880801097040b21b475748b2071426c28fc34;p=openldap

Fix tmpmemctx conflicts
---

diff --git a/servers/slapd/attr.c b/servers/slapd/attr.c
index f46be1f472..4bb4e2a53a 100644
--- a/servers/slapd/attr.c
+++ b/servers/slapd/attr.c
@@ -167,7 +167,7 @@ attr_merge_normalize(
 		
 		for ( i = 0; vals[i].bv_val; i++ );
 
-		nvals = ch_calloc( sizeof(struct berval), i + 1 );
+		nvals = sl_calloc( sizeof(struct berval), i + 1, memctx );
 		for ( i = 0; vals[i].bv_val; i++ ) {
 			rc = (*desc->ad_type->sat_equality->smr_normalize)(
 					0,
@@ -187,7 +187,7 @@ attr_merge_normalize(
 
 error_return:;
 	if ( nvals != NULL ) {
-		ber_bvarray_free( nvals );
+		ber_bvarray_free_x( nvals, memctx );
 	}
 	return rc;
 }
@@ -252,7 +252,7 @@ attr_merge_normalize_one(
 
 	rc = attr_merge_one( e, desc, val, nvalp );
 	if ( nvalp != NULL ) {
-		ch_free( nval.bv_val );
+		sl_free( nval.bv_val, memctx );
 	}
 	return rc;
 }