Revert 1.159, seems to trigger a concurrency bug. ???

diff --git a/servers/slapd/back-bdb/back-bdb.h b/servers/slapd/back-bdb/back-bdb.h
index 36b821c8aebeca4585afa90a4f4f0726130bd672..9b9020b1d3a77af1ce917c4914bbe4648c447b5e 100644 (file)
--- a/servers/slapd/back-bdb/back-bdb.h
+++ b/servers/slapd/back-bdb/back-bdb.h
@@ -106,7 +106,7 @@ typedef struct bdb_entry_info {
         * to avoid conflicting with BDB's internal locks. So add a byte here
         * that is always zero.
         */
-       char bei_lockpad;
+       short bei_lockpad;
 
        short bei_state;
 #define        CACHE_ENTRY_DELETED     1
@@ -151,10 +151,10 @@ typedef struct bdb_cache {
        EntryInfo       *c_lruhead;     /* lru - add accessed entries here */
        EntryInfo       *c_lrutail;     /* lru - rem lru entries from here */
        EntryInfo       c_dntree;
-       unsigned        c_maxsize;
+       int             c_maxsize;
        int             c_cursize;
-       unsigned        c_minfree;
-       unsigned        c_eimax;
+       int             c_minfree;
+       int             c_eimax;
        int             c_eiused;       /* EntryInfo's in use */
        int             c_leaves;       /* EntryInfo leaf nodes */
        int             c_purging;
@@ -223,7 +223,7 @@ struct bdb_info {
 
        ID                      bi_lastid;
        ldap_pvt_thread_mutex_t bi_lastid_mutex;
-       unsigned        bi_idl_cache_max_size;
+       int             bi_idl_cache_max_size;
        int             bi_idl_cache_size;
        Avlnode         *bi_idl_tree;
        bdb_idl_cache_entry_t   *bi_idl_lru_head;