ITS#2449, broken NOT filters

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

diff --git a/servers/slapd/back-bdb/init.c b/servers/slapd/back-bdb/init.c
index 8e0669ea0263917ec90d58311f6b73d0ac59e822..5e6c1d3f1f01c6efb81b5506fc15f934926d8434 100644 (file)
--- a/servers/slapd/back-bdb/init.c
+++ b/servers/slapd/back-bdb/init.c
@@ -12,10 +12,9 @@
 #include <ac/unistd.h>
 #include <ac/stdlib.h>
 
-#include <lutil.h>
-
 #include "back-bdb.h"
 #include "external.h"
+#include <lutil.h>
 
 static struct bdbi_database {
        char *file;
@@ -96,10 +95,9 @@ bdb_db_init( BackendDB *be )
        bdb->bi_search_stack = NULL;
 
 #if defined(LDAP_CLIENT_UPDATE) || defined(LDAP_SYNC)
-       LDAP_LIST_INIT (&bdb->psearch_list);
+       LDAP_LIST_INIT (&bdb->bi_psearch_list);
 #endif
 
-       ldap_pvt_thread_mutex_init( &bdb->bi_database_mutex );
        ldap_pvt_thread_mutex_init( &bdb->bi_lastid_mutex );
        ldap_pvt_thread_mutex_init( &bdb->bi_cache.lru_mutex );
        ldap_pvt_thread_rdwr_init ( &bdb->bi_cache.c_rwlock );
@@ -202,19 +200,35 @@ bdb_db_open( BackendDB *be )
 
 #ifdef SLAP_IDL_CACHE
        if ( bdb->bi_idl_cache_max_size ) {
-               ldap_pvt_thread_mutex_init( &bdb->bi_idl_tree_mutex );
+               ldap_pvt_thread_rdwr_init( &bdb->bi_idl_tree_rwlock );
+               ldap_pvt_thread_mutex_init( &bdb->bi_idl_tree_lrulock );
                bdb->bi_idl_cache_size = 0;
        }
 #endif
 
 #ifdef BDB_SUBDIRS
        {
-               char dir[MAXPATHLEN];
-               size_t len = strlen( bdb->bi_dbenv_home );
-
-               strcpy( dir, bdb->bi_dbenv_home );
-               strcat( &dir[len], BDB_TMP_SUBDIR );
+               char dir[MAXPATHLEN], *ptr;
                
+               if (bdb->bi_dbenv_home[0] == '.') {
+                       /* If home is a relative path, relative subdirs
+                        * are just concat'd by BDB. We don't want the
+                        * path to be concat'd twice, e.g.
+                        * ./test-db/./test-db/tmp
+                        */
+                       ptr = dir;
+               } else {
+                       ptr = lutil_strcopy( dir, bdb->bi_dbenv_home );
+                       *ptr++ = LDAP_DIRSEP[0];
+#ifdef HAVE_EBCDIC
+                       __atoe( dir );
+#endif
+               }
+
+               strcpy( ptr, BDB_TMP_SUBDIR );
+#ifdef HAVE_EBCDIC
+               __atoe( ptr );
+#endif
                rc = bdb->bi_dbenv->set_tmp_dir( bdb->bi_dbenv, dir );
                if( rc != 0 ) {
 #ifdef NEW_LOGGING
@@ -229,8 +243,10 @@ bdb_db_open( BackendDB *be )
                        return rc;
                }
 
-               strcat( &dir[len], BDB_LG_SUBDIR );
-
+               strcpy( ptr, BDB_LG_SUBDIR );
+#ifdef HAVE_EBCDIC
+               __atoe( ptr );
+#endif
                rc = bdb->bi_dbenv->set_lg_dir( bdb->bi_dbenv, dir );
                if( rc != 0 ) {
 #ifdef NEW_LOGGING
@@ -245,8 +261,10 @@ bdb_db_open( BackendDB *be )
                        return rc;
                }
 
-               strcat( &dir[len], BDB_DATA_SUBDIR );
-
+               strcpy( ptr, BDB_DATA_SUBDIR );
+#ifdef HAVE_EBCDIC
+               __atoe( ptr );
+#endif
                rc = bdb->bi_dbenv->set_data_dir( bdb->bi_dbenv, dir );
                if( rc != 0 ) {
 #ifdef NEW_LOGGING
@@ -362,18 +380,18 @@ bdb_db_open( BackendDB *be )
 #ifdef HAVE_EBCDIC
                strcpy( path, bdbi_databases[i].file );
                __atoe( path );
-               rc = DB_OPEN( db->bdi_db, 
+               rc = DB_OPEN( db->bdi_db, NULL,
                        path,
                /*      bdbi_databases[i].name, */ NULL,
                        bdbi_databases[i].type,
-                       bdbi_databases[i].flags | flags,
+                       bdbi_databases[i].flags | flags | DB_AUTO_COMMIT,
                        bdb->bi_dbenv_mode );
 #else
-               rc = DB_OPEN( db->bdi_db, 
+               rc = DB_OPEN( db->bdi_db, NULL,
                        bdbi_databases[i].file,
                /*      bdbi_databases[i].name, */ NULL,
                        bdbi_databases[i].type,
-                       bdbi_databases[i].flags | flags,
+                       bdbi_databases[i].flags | flags | DB_AUTO_COMMIT,
                        bdb->bi_dbenv_mode );
 #endif
 
@@ -443,16 +461,21 @@ bdb_db_close( BackendDB *be )
        bdb_cache_release_all (&bdb->bi_cache);
 
 #ifdef SLAP_IDL_CACHE
-       ldap_pvt_thread_mutex_lock ( &bdb->bi_idl_tree_mutex );
-       entry = bdb->bi_idl_lru_head;
-       while ( entry != NULL ) {
-               next_entry = entry->idl_lru_next;
-               free( entry->idl );
-               free( entry->kstr.bv_val );
-               free( entry );
-               entry = next_entry;
+       if ( bdb->bi_idl_cache_max_size ) {
+               ldap_pvt_thread_rdwr_wlock ( &bdb->bi_idl_tree_rwlock );
+               entry = bdb->bi_idl_lru_head;
+               while ( entry != NULL ) {
+                       next_entry = entry->idl_lru_next;
+                       avl_delete( &bdb->bi_idl_tree, (caddr_t) entry,
+                                       bdb_idl_entry_cmp );
+                       if ( entry->idl )
+                               free( entry->idl );
+                       free( entry->kstr.bv_val );
+                       free( entry );
+                       entry = next_entry;
+               }
+               ldap_pvt_thread_rdwr_wunlock ( &bdb->bi_idl_tree_rwlock );
        }
-       ldap_pvt_thread_mutex_unlock ( &bdb->bi_idl_tree_mutex );
 #endif
 
        return 0;
@@ -480,8 +503,6 @@ bdb_db_destroy( BackendDB *be )
 #endif
                }
 
-               bdb_cache_release_all (&bdb->bi_cache);
-
                rc = bdb->bi_dbenv->close( bdb->bi_dbenv, 0 );
                bdb->bi_dbenv = NULL;
                if( rc != 0 ) {
@@ -506,7 +527,12 @@ bdb_db_destroy( BackendDB *be )
        ldap_pvt_thread_rdwr_destroy ( &bdb->bi_cache.c_rwlock );
        ldap_pvt_thread_mutex_destroy( &bdb->bi_cache.lru_mutex );
        ldap_pvt_thread_mutex_destroy( &bdb->bi_lastid_mutex );
-       ldap_pvt_thread_mutex_destroy( &bdb->bi_database_mutex );
+#ifdef SLAP_IDL_CACHE
+       if ( bdb->bi_idl_cache_max_size ) {
+               ldap_pvt_thread_rdwr_destroy( &bdb->bi_idl_tree_rwlock );
+               ldap_pvt_thread_mutex_destroy( &bdb->bi_idl_tree_lrulock );
+       }
+#endif
 
        ch_free( bdb );
        be->be_private = NULL;
@@ -646,22 +672,11 @@ bdb_initialize(
 
        bi->bi_extended = bdb_extended;
 
-#if 1
-       /*
-        * these routines (and their callers) are not yet designed
-        * to work with transaction.  Using them may cause deadlock.
-        */
-       bi->bi_acl_group = bdb_group;
-       bi->bi_acl_attribute = bdb_attribute;
-#else
-       bi->bi_acl_group = 0;
-       bi->bi_acl_attribute = 0;
-#endif
-
        bi->bi_chk_referrals = bdb_referrals;
        bi->bi_operational = bdb_operational;
        bi->bi_has_subordinates = bdb_hasSubordinates;
        bi->bi_entry_release_rw = bdb_entry_release;
+       bi->bi_entry_get_rw = bdb_entry_get;
 
        /*
         * hooks for slap tools