X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-bdb%2Finit.c;h=8563b3ee83a88388177fda06395349a6d4c5835e;hb=02fb60d3dad11f9ee46feb6ba3eb9ad96dde0c48;hp=0283e3170bbb1debb74491ca8df931ab5e6ec59b;hpb=b7f0983efafb6139d45814978ec376f87c228c37;p=openldap

diff --git a/servers/slapd/back-bdb/init.c b/servers/slapd/back-bdb/init.c
index 0283e3170b..8563b3ee83 100644
--- a/servers/slapd/back-bdb/init.c
+++ b/servers/slapd/back-bdb/init.c
@@ -171,11 +171,11 @@ bdb_db_open( BackendDB *be )
 	u_int32_t flags;
 
 #ifdef NEW_LOGGING
-	LDAP_LOG(( "init", LDAP_LEVEL_ARGS, "bdb_db_open: %s\n", be->be_suffix[0]->bv_val ));
+	LDAP_LOG(( "init", LDAP_LEVEL_ARGS, "bdb_db_open: %s\n", be->be_suffix[0].bv_val ));
 #else
 	Debug( LDAP_DEBUG_ARGS,
 		"bdb_db_open: %s\n",
-		be->be_suffix[0]->bv_val, 0, 0 );
+		be->be_suffix[0].bv_val, 0, 0 );
 #endif
 
 	/* we should check existance of dbenv_home and db_directory */
@@ -195,7 +195,7 @@ bdb_db_open( BackendDB *be )
 	flags = DB_INIT_MPOOL | DB_THREAD | DB_CREATE
 		| DB_INIT_LOCK | DB_INIT_LOG | DB_INIT_TXN | DB_RECOVER;
 
-	bdb->bi_dbenv->set_errpfx( bdb->bi_dbenv, be->be_suffix[0]->bv_val );
+	bdb->bi_dbenv->set_errpfx( bdb->bi_dbenv, be->be_suffix[0].bv_val );
 	bdb->bi_dbenv->set_errcall( bdb->bi_dbenv, bdb_errcall );
 #ifndef NO_THREADS
 	bdb->bi_dbenv->set_lk_detect( bdb->bi_dbenv, bdb->bi_lock_detect );
@@ -479,6 +479,9 @@ bdb_initialize(
 #endif
 #ifdef LDAP_CONTROL_NOOP
 		LDAP_CONTROL_NOOP,
+#endif
+#ifdef LDAP_CONTROL_VALUESRETURNFILTER
+ 		LDAP_CONTROL_VALUESRETURNFILTER,
 #endif
 		NULL
 	};
@@ -558,7 +561,7 @@ bdb_initialize(
 
 	bi->bi_extended = bdb_extended;
 
-#if 0
+#if 1
 	/*
 	 * these routines (and their callers) are not yet designed
 	 * to work with transaction.  Using them may cause deadlock.