From: Howard Chu <hyc@openldap.org>
Date: Thu, 12 Sep 2002 02:47:18 +0000 (+0000)
Subject: Set BDB's global allocators to ber_*, don't bother with the per-env setting.
X-Git-Tag: NO_SLAP_OP_BLOCKS~984
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=1263e40b55aba8699c7f207ee83a5362c09e6900;p=openldap

Set BDB's global allocators to ber_*, don't bother with the per-env setting.
---

diff --git a/servers/slapd/back-bdb/init.c b/servers/slapd/back-bdb/init.c
index 64ef4952aa..4b5f366b85 100644
--- a/servers/slapd/back-bdb/init.c
+++ b/servers/slapd/back-bdb/init.c
@@ -186,6 +186,10 @@ bdb_db_open( BackendDB *be )
 		be->be_suffix[0].bv_val, 0, 0 );
 #endif
 
+	db_env_set_func_free( ber_memfree );
+	db_env_set_func_malloc( ber_memalloc );
+	db_env_set_func_realloc( ber_memrealloc );
+
 	/* we should check existance of dbenv_home and db_directory */
 
 	rc = db_env_create( &bdb->bi_dbenv, 0 );
@@ -202,9 +206,6 @@ bdb_db_open( BackendDB *be )
 		return rc;
 	}
 
-	bdb->bi_dbenv->set_alloc( bdb->bi_dbenv, (db_malloc *)ber_memalloc,
-		(db_realloc *)ber_memrealloc, ber_memfree );
-
 	flags = DB_INIT_MPOOL | DB_THREAD | DB_CREATE
 		| DB_INIT_LOCK | DB_INIT_LOG | DB_INIT_TXN;