Fix previous commit

diff --git a/servers/slapd/back-ldbm/filterindex.c b/servers/slapd/back-ldbm/filterindex.c
index f019e1765218a0b859de5c9d10338e0f93fff637..95ba7c6cf2bc45908a73a98952af41d310c82941 100644 (file)
--- 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 00e6c6a37523a7389ea95dc47830cca3c403a433..00e1d2e6c5bb6afd8288e3a23d4cf9ecb65f9e42 100644 (file)
--- 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 e319fa3a12457a549ad34fc5fa2a799eb3787bc4..8466c31bfad7b03bf6b78647ca4854c424eb61d0 100644 (file)
--- 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;
 }