ITS#5339

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

diff --git a/servers/slapd/back-bdb/dbcache.c b/servers/slapd/back-bdb/dbcache.c
index 01c0f7d1db28318ea8aed6176d0ad8d1b3b85ac1..c6b8b2368411553f0753309d44a4c5568baaa789 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-2006 The OpenLDAP Foundation.
+ * Copyright 2000-2008 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -60,7 +60,7 @@ bdb_db_hash(
 int
 bdb_db_cache(
        Backend *be,
-       const char *name,
+       struct berval *name,
        DB **dbout )
 {
        int i, flags;
@@ -72,7 +72,7 @@ bdb_db_cache(
        *dbout = NULL;
 
        for( i=BDB_NDB; i < bdb->bi_ndatabases; i++ ) {
-               if( !strcmp( bdb->bi_databases[i]->bdi_name, name) ) {
+               if( !ber_bvcmp( &bdb->bi_databases[i]->bdi_name, name) ) {
                        *dbout = bdb->bi_databases[i]->bdi_db;
                        return 0;
                }
@@ -82,7 +82,7 @@ bdb_db_cache(
 
        /* check again! may have been added by another thread */
        for( i=BDB_NDB; i < bdb->bi_ndatabases; i++ ) {
-               if( !strcmp( bdb->bi_databases[i]->bdi_name, name) ) {
+               if( !ber_bvcmp( &bdb->bi_databases[i]->bdi_name, name) ) {
                        *dbout = bdb->bi_databases[i]->bdi_db;
                        ldap_pvt_thread_mutex_unlock( &bdb->bi_database_mutex );
                        return 0;
@@ -96,7 +96,7 @@ bdb_db_cache(
 
        db = (struct bdb_db_info *) ch_calloc(1, sizeof(struct bdb_db_info));
 
-       db->bdi_name = ch_strdup( name );
+       ber_dupbv( &db->bdi_name, name );
 
        rc = db_create( &db->bdi_db, bdb->bi_dbenv, 0 );
        if( rc != 0 ) {
@@ -104,17 +104,32 @@ 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;
        }
 
+       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;
+               }
+       }
+
        rc = db->bdi_db->set_pagesize( db->bdi_db, BDB_PAGESIZE );
 #ifdef BDB_INDEX_USE_HASH
        rc = db->bdi_db->set_h_hash( db->bdi_db, bdb_db_hash );
 #endif
        rc = db->bdi_db->set_flags( db->bdi_db, DB_DUP | DB_DUPSORT );
 
-       file = ch_malloc( strlen( name ) + sizeof(BDB_SUFFIX) );
-       sprintf( file, "%s" BDB_SUFFIX, name );
+       file = ch_malloc( db->bdi_name.bv_len + sizeof(BDB_SUFFIX) );
+       strcpy( file, db->bdi_name.bv_val );
+       strcpy( file+db->bdi_name.bv_len, BDB_SUFFIX );
 
 #ifdef HAVE_EBCDIC
        __atoe( file );
@@ -138,7 +153,7 @@ bdb_db_cache(
        if( rc != 0 ) {
                Debug( LDAP_DEBUG_ANY,
                        "bdb_db_cache: db_open(%s) failed: %s (%d)\n",
-                       name, db_strerror(rc), rc );
+                       name->bv_val, db_strerror(rc), rc );
                ldap_pvt_thread_mutex_unlock( &bdb->bi_database_mutex );
                return rc;
        }