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 b1bf856a971b6b45449be221b9d1149bf0bb4db9..f6ab841ba4adafbcb792be14e90a1f7af2256fc1 100644 (file)
--- a/servers/slapd/back-bdb/config.c
+++ b/servers/slapd/back-bdb/config.c
@@ -1,7 +1,7 @@
-/* config.c - ldbm backend configuration file routine */
+/* 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,6 +47,76 @@ 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;
+
+       /* transaction checkpoint configuration */
+       } else if ( strcasecmp( argv[0], "checkpoint" ) == 0 ) {
+               if ( argc < 3 ) {
+                       fprintf( stderr, "%s: line %d: "
+                               "missing parameters in \"checkpoint <kbyte> <min>\" line\n",
+                               fname, lineno );
+                       return 1;
+               }
+               bdb->bi_txn_cp = 1;
+               bdb->bi_txn_cp_kbyte = strtol( argv[1], NULL, 0 );
+               bdb->bi_txn_cp_min = strtol( argv[2], NULL, 0 );
+
+       /* lock detect configuration */
+       } else if ( strcasecmp( argv[0], "lockdetect" ) == 0 ) {
+#ifndef NO_THREADS
+               if ( argc < 3 ) {
+                       fprintf( stderr, "%s: line %d: "
+                               "missing parameters in \"lockDetect <policy> <seconds>\" line\n",
+                               fname, lineno );
+                       return 1;
+               }
+
+               if( strcasecmp( argv[1], "default" ) == 0 ) {
+                       bdb->bi_lock_detect = DB_LOCK_DEFAULT;
+
+               } else if( strcasecmp( argv[1], "oldest" ) == 0 ) {
+                       bdb->bi_lock_detect = DB_LOCK_OLDEST;
+
+               } else if( strcasecmp( argv[1], "random" ) == 0 ) {
+                       bdb->bi_lock_detect = DB_LOCK_RANDOM;
+
+               } 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",
+                               fname, lineno, argv[1] );
+                       return 1;
+               }
+
+               bdb->bi_lock_detect_seconds = strtol( argv[2], NULL, 0 );
+               if( bdb->bi_lock_detect_seconds < 1 ) {
+                       fprintf( stderr, "%s: line %d: "
+                               "bad seconds (%s) in \"lockDetect <policy> <seconds>\" line\n",
+                               fname, lineno, argv[2] );
+                       return 1;
+               }
+#else
+               fprintf( stderr, "%s: line %d: "
+                       "NO THREADS: lockDetect line ignored\n",
+                       fname, lineno );
+#endif
+
        /* mode with which to create new database files */
        } else if ( strcasecmp( argv[0], "mode" ) == 0 ) {
                if ( argc < 2 ) {
@@ -52,7 +127,7 @@ bdb_db_config(
                }
                bdb->bi_dbenv_mode = strtol( argv[1], NULL, 0 );
 
-#if 0
+#if BDB_FILTER_INDICES
        /* attribute to index */
        } else if ( strcasecmp( argv[0], "index" ) == 0 ) {
                int rc;
@@ -67,7 +142,7 @@ bdb_db_config(
                                "line (ignored)\n",
                                fname, lineno );
                }
-               rc = attr_index_config( li, fname, lineno, argc - 1, &argv[1] );
+               rc = bdb_attr_index_config( bdb, fname, lineno, argc - 1, &argv[1] );
 
                if( rc != LDAP_SUCCESS ) return 1;
 #endif