Reset Entry->e_ocflags to 0 if objectClass attr is modified.

[openldap] / servers / slapd / back-bdb / config.c

diff --git a/servers/slapd/back-bdb/config.c b/servers/slapd/back-bdb/config.c
index 46a5da0273ad0bb91523c5d9aa95e5866837cb7c..f6ab841ba4adafbcb792be14e90a1f7af2256fc1 100644 (file)
--- a/servers/slapd/back-bdb/config.c
+++ b/servers/slapd/back-bdb/config.c
@@ -1,7 +1,7 @@
 /* config.c - bdb backend configuration file routine */
 /* $OpenLDAP$ */
 /*
- * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
@@ -12,6 +12,11 @@
 
 #include "back-bdb.h"
 
+#define        SLAP_BDB_ALLOW_DBNOTXN
+#ifdef DB_DIRTY_READ
+#      define  SLAP_BDB_ALLOW_DIRTY_READ
+#endif
+
 int
 bdb_db_config(
        BackendDB       *be,
@@ -42,7 +47,15 @@ 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;
+#endif
        /* transaction checkpoint configuration */
        } else if ( strcasecmp( argv[0], "dbnosync" ) == 0 ) {
                bdb->bi_dbenv_xflags |= DB_TXN_NOSYNC;
@@ -81,6 +94,9 @@ bdb_db_config(
                } else if( strcasecmp( argv[1], "youngest" ) == 0 ) {
                        bdb->bi_lock_detect = DB_LOCK_YOUNGEST;
 
+               } else if( strcasecmp( argv[1], "fewest" ) == 0 ) {
+                       bdb->bi_lock_detect = DB_LOCK_MINLOCKS;
+
                } else {
                        fprintf( stderr, "%s: line %d: "
                                "bad policy (%s) in \"lockDetect <policy> <seconds>\" line\n",