X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-bdb%2Fconfig.c;h=bd74e95e8c32f39f3bb19f0b8faa22ab72cba048;hb=08059f1633bfd9d0a709761b026bdb8e4441c6e6;hp=6de743254e60ca3ac8267d97aaaf55358069c699;hpb=713e6beb8d0ab8e3493f482f16fe4c42ebffe1ee;p=openldap

diff --git a/servers/slapd/back-bdb/config.c b/servers/slapd/back-bdb/config.c
index 6de743254e..bd74e95e8c 100644
--- a/servers/slapd/back-bdb/config.c
+++ b/servers/slapd/back-bdb/config.c
@@ -12,7 +12,6 @@
 
 #include "back-bdb.h"
 
-#define	SLAP_BDB_ALLOW_DBNOTXN
 #ifdef DB_DIRTY_READ
 #	define	SLAP_BDB_ALLOW_DIRTY_READ
 #endif
@@ -47,11 +46,6 @@ bdb_db_config(
 		}
 		bdb->bi_dbenv_home = ch_strdup( argv[1] );
 
-#ifdef SLAP_BDB_ALLOW_DBNOTXN
-	/* turn off transactions, use CDB mode instead */
-	} else if ( strcasecmp( argv[0], "dbnotxn" ) == 0 ) {
-		bdb->bi_txn = 0;
-#endif
 #ifdef SLAP_BDB_ALLOW_DIRTY_READ
 	} else if ( strcasecmp( argv[0], "dirtyread" ) == 0 ) {
 		bdb->bi_db_opflags |= DB_DIRTY_READ;
@@ -127,7 +121,6 @@ bdb_db_config(
 		}
 		bdb->bi_dbenv_mode = strtol( argv[1], NULL, 0 );
 
-#if BDB_FILTER_INDICES
 	/* attribute to index */
 	} else if ( strcasecmp( argv[0], "index" ) == 0 ) {
 		int rc;
@@ -145,7 +138,6 @@ bdb_db_config(
 		rc = bdb_attr_index_config( bdb, fname, lineno, argc - 1, &argv[1] );
 
 		if( rc != LDAP_SUCCESS ) return 1;
-#endif
 
 	/* size of the cache in entries */
          } else if ( strcasecmp( argv[0], "cachesize" ) == 0 ) {