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 5533206dc65eca5b69720afc3332f881aff00749..b896191e27b9cbd8c4f439db1dd29fd57d17b6b9 100644 (file)
--- a/servers/slapd/back-bdb/back-bdb.h
+++ b/servers/slapd/back-bdb/back-bdb.h
@@ -9,9 +9,8 @@
 #define _BACK_BDB_H_
 
 #include <portable.h>
-#include <db.h>
-
 #include "slap.h"
+#include <db.h>
 
 LDAP_BEGIN_DECL
 
@@ -104,7 +103,6 @@ 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;
@@ -112,12 +110,12 @@ struct bdb_info {
        u_int32_t       bi_txn_cp_kbyte;
 
        int                     bi_lock_detect;
-#ifdef NO_THREADS
-       int             bi_locker_id;
-#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]
@@ -171,11 +169,8 @@ struct bdb_op_info {
 #define BDB_REUSE_LOCKERS
 
 #ifdef BDB_REUSE_LOCKERS
-/* Hack - we depend on "op" and "bdb" being the right variable names
- * in each invoker.
- */
 #define        LOCK_ID_FREE(env, locker)
-#define        LOCK_ID(env, locker)    bdb_locker_id(op, bdb, locker)
+#define        LOCK_ID(env, locker)    bdb_locker_id(op, env, locker)
 #else
 #define        LOCK_ID_FREE(env, locker)       XLOCK_ID_FREE(env, locker)
 #define        LOCK_ID(env, locker)            XLOCK_ID(env, locker)