From: Howard Chu <hyc@openldap.org>
Date: Fri, 11 Apr 2003 01:53:31 +0000 (+0000)
Subject: Fix previous commit
X-Git-Tag: OPENLDAP_REL_ENG_2_2_0ALPHA~403
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=aa470b80521ac5d4d1e5fd543c1ecfae7a1a62de;p=openldap

Fix previous commit
---

diff --git a/servers/slapd/back-ldbm/filterindex.c b/servers/slapd/back-ldbm/filterindex.c
index f019e17652..95ba7c6cf2 100644
--- a/servers/slapd/back-ldbm/filterindex.c
+++ b/servers/slapd/back-ldbm/filterindex.c
@@ -478,7 +478,7 @@ equality_candidates(
 		if( idl == NULL ) break;
 	}
 
-	ber_bvarray_free( keys );
+	ber_bvarray_free_x( keys, op->o_tmpmemctx );
 
 	ldbm_cache_close( op->o_bd, db );
 
@@ -657,7 +657,7 @@ approx_candidates(
 		if( idl == NULL ) break;
 	}
 
-	ber_bvarray_free( keys );
+	ber_bvarray_free_x( keys, op->o_tmpmemctx );
 
 	ldbm_cache_close( op->o_bd, db );
 
@@ -888,7 +888,7 @@ substring_candidates(
 		if( idl == NULL ) break;
 	}
 
-	ber_bvarray_free( keys );
+	ber_bvarray_free_x( keys, op->o_tmpmemctx );
 
 	ldbm_cache_close( op->o_bd, db );
 
diff --git a/servers/slapd/back-ldbm/index.c b/servers/slapd/back-ldbm/index.c
index 00e6c6a375..00e1d2e6c5 100644
--- a/servers/slapd/back-ldbm/index.c
+++ b/servers/slapd/back-ldbm/index.c
@@ -190,7 +190,7 @@ static int indexer(
 			for( i=0; keys[i].bv_val != NULL; i++ ) {
 				key_change( op->o_bd, db, &keys[i], id, opid );
 			}
-			ber_bvarray_free( keys );
+			ber_bvarray_free_x( keys, op->o_tmpmemctx );
 		}
 	}
 
@@ -206,7 +206,7 @@ static int indexer(
 			for( i=0; keys[i].bv_val != NULL; i++ ) {
 				key_change( op->o_bd, db, &keys[i], id, opid );
 			}
-			ber_bvarray_free( keys );
+			ber_bvarray_free_x( keys, op->o_tmpmemctx );
 		}
 	}
 
@@ -222,7 +222,7 @@ static int indexer(
 			for( i=0; keys[i].bv_val != NULL; i++ ) {
 				key_change( op->o_bd, db, &keys[i], id, opid );
 			}
-			ber_bvarray_free( keys );
+			ber_bvarray_free_x( keys, op->o_tmpmemctx );
 		}
 	}
 
diff --git a/servers/slapd/tools/mimic.c b/servers/slapd/tools/mimic.c
index e319fa3a12..8466c31bfa 100644
--- a/servers/slapd/tools/mimic.c
+++ b/servers/slapd/tools/mimic.c
@@ -230,7 +230,7 @@ int slap_sasl_authorized( Connection *conn,
 }
 
 int slap_mods_check( Modifications *ml, int update, const char **text,
-	char *textbuf, size_t textlen )
+	char *textbuf, size_t textlen, void *ctx )
 {
 	return -1;
 }