Never let ldif_parse_line() return a NULL value with success.

[openldap] / servers / slapd / back-bdb / back-bdb.h

diff --git a/servers/slapd/back-bdb/back-bdb.h b/servers/slapd/back-bdb/back-bdb.h
index 18d2ab941999e43e04352a8956cc099844d17316..b896191e27b9cbd8c4f439db1dd29fd57d17b6b9 100644 (file)
--- a/servers/slapd/back-bdb/back-bdb.h
+++ b/servers/slapd/back-bdb/back-bdb.h
@@ -9,13 +9,11 @@
 #define _BACK_BDB_H_
 
 #include <portable.h>
-#include <db.h>
-
 #include "slap.h"
+#include <db.h>
 
 LDAP_BEGIN_DECL
 
-#define BDB_IDL_MULTI          1
 /* #define BDB_HIER            1 */
 
 #define DN_BASE_PREFIX         SLAP_INDEX_EQUALITY_PREFIX
@@ -50,22 +48,14 @@ LDAP_BEGIN_DECL
 /* The bdb on-disk entry format is pretty space-inefficient. Average
  * sized user entries are 3-4K each. You need at least two entries to
  * fit into a single database page, more is better. 64K is BDB's
- * upper bound. The same issues arise with IDLs in the index databases,
- * but it's nearly impossible to avoid overflows there.
- *
- * When using BDB_IDL_MULTI, the IDL size is no longer an issue. Smaller
- * pages are better for concurrency.
+ * upper bound. Smaller pages are better for concurrency.
  */
 #ifndef BDB_ID2ENTRY_PAGESIZE
 #define        BDB_ID2ENTRY_PAGESIZE   16384
 #endif
 
 #ifndef BDB_PAGESIZE
-#ifdef BDB_IDL_MULTI
 #define        BDB_PAGESIZE    4096    /* BDB's original default */
-#else
-#define        BDB_PAGESIZE    16384
-#endif
 #endif
 
 #define DEFAULT_CACHE_SIZE     1000
@@ -113,21 +103,19 @@ struct bdb_info {
        Avlnode         *bi_tree;
        ldap_pvt_thread_rdwr_t  bi_tree_rdwr;
        void            *bi_troot;
-       int             bi_nrdns;
 #endif
 
        int                     bi_txn_cp;
        u_int32_t       bi_txn_cp_min;
        u_int32_t       bi_txn_cp_kbyte;
 
-#ifndef NO_THREADS
        int                     bi_lock_detect;
-       int                     bi_lock_detect_seconds;
-       ldap_pvt_thread_t       bi_lock_detect_tid;
-#endif
 
        ID                      bi_lastid;
        ldap_pvt_thread_mutex_t bi_lastid_mutex;
+#ifdef LDAP_CLIENT_UPDATE
+       LDAP_LIST_HEAD(pl, slap_op) psearch_list;
+#endif
 };
 
 #define bi_id2entry    bi_databases[BDB_ID2ENTRY]