Merge remote branch 'origin/mdb.master'

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

diff --git a/servers/slapd/back-bdb/dbcache.c b/servers/slapd/back-bdb/dbcache.c
index ba005476f2e6953b4f7242019eac883c911bc9dd..9183759090b03e57f4a96071769c70f77da32f9e 100644 (file)
--- a/servers/slapd/back-bdb/dbcache.c
+++ b/servers/slapd/back-bdb/dbcache.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 2000-2007 The OpenLDAP Foundation.
+ * Copyright 2000-2011 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -57,6 +57,29 @@ bdb_db_hash(
 #define        BDB_INDEXTYPE   DB_BTREE
 #endif
 
+/* If a configured size is found, return it, otherwise return 0 */
+int
+bdb_db_findsize(
+       struct bdb_info *bdb,
+       struct berval *name
+)
+{
+       struct bdb_db_pgsize *bp;
+       int rc;
+
+       for ( bp = bdb->bi_pagesizes; bp; bp=bp->bdp_next ) {
+               rc = strncmp( name->bv_val, bp->bdp_name.bv_val, name->bv_len );
+               if ( !rc ) {
+                       if ( name->bv_len == bp->bdp_name.bv_len )
+                               return bp->bdp_size;
+                       if ( name->bv_len < bp->bdp_name.bv_len &&
+                               bp->bdp_name.bv_val[name->bv_len] == '.' )
+                               return bp->bdp_size;
+               }
+       }
+       return 0;
+}
+
 int
 bdb_db_cache(
        Backend *be,
@@ -104,10 +127,41 @@ bdb_db_cache(
                        "bdb_db_cache: db_create(%s) failed: %s (%d)\n",
                        bdb->bi_dbenv_home, db_strerror(rc), rc );
                ldap_pvt_thread_mutex_unlock( &bdb->bi_database_mutex );
+               ch_free( db );
                return rc;
        }
 
-       rc = db->bdi_db->set_pagesize( db->bdi_db, BDB_PAGESIZE );
+       if( !BER_BVISNULL( &bdb->bi_db_crypt_key )) {
+               rc = db->bdi_db->set_flags( db->bdi_db, DB_ENCRYPT );
+               if ( rc ) {
+                       Debug( LDAP_DEBUG_ANY,
+                               "bdb_db_cache: db set_flags(DB_ENCRYPT)(%s) failed: %s (%d)\n",
+                               bdb->bi_dbenv_home, db_strerror(rc), rc );
+                       ldap_pvt_thread_mutex_unlock( &bdb->bi_database_mutex );
+                       db->bdi_db->close( db->bdi_db, 0 );
+                       ch_free( db );
+                       return rc;
+               }
+       }
+
+       if( bdb->bi_flags & BDB_CHKSUM ) {
+               rc = db->bdi_db->set_flags( db->bdi_db, DB_CHKSUM );
+               if ( rc ) {
+                       Debug( LDAP_DEBUG_ANY,
+                               "bdb_db_cache: db set_flags(DB_CHKSUM)(%s) failed: %s (%d)\n",
+                               bdb->bi_dbenv_home, db_strerror(rc), rc );
+                       ldap_pvt_thread_mutex_unlock( &bdb->bi_database_mutex );
+                       db->bdi_db->close( db->bdi_db, 0 );
+                       ch_free( db );
+                       return rc;
+               }
+       }
+
+       /* If no explicit size set, use the FS default */
+       flags = bdb_db_findsize( bdb, name );
+       if ( flags )
+               rc = db->bdi_db->set_pagesize( db->bdi_db, flags );
+
 #ifdef BDB_INDEX_USE_HASH
        rc = db->bdi_db->set_h_hash( db->bdi_db, bdb_db_hash );
 #endif