NVALUES: fix a couple of value_find_ex() calls

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

diff --git a/servers/slapd/back-bdb/dbcache.c b/servers/slapd/back-bdb/dbcache.c
index 36c4daee187fbbb7330e7460bb1fa45cb4e10e60..7f5d6718d09a5509be18638cc28058b5f23d933d 100644 (file)
--- a/servers/slapd/back-bdb/dbcache.c
+++ b/servers/slapd/back-bdb/dbcache.c
@@ -1,7 +1,7 @@
 /* dbcache.c - manage cache of open databases */
 /* $OpenLDAP$ */
 /*
- * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
@@ -22,7 +22,6 @@
 /* Pass-thru hash function. Since the indexer is already giving us hash
  * values as keys, we don't need BDB to re-hash them.
  */
-#if LUTIL_HASH_BYTES == 4
 static u_int32_t
 bdb_db_hash(
        DB *db,
@@ -30,10 +29,19 @@ bdb_db_hash(
        u_int32_t length
 )
 {
-       u_int32_t *ret = (u_int32_t *)bytes;
-       return *ret;
+       u_int32_t ret = 0;
+       unsigned char *dst = (unsigned char *)&ret;
+       const unsigned char *src = (const unsigned char *)bytes;
+
+       if ( length > sizeof(u_int32_t) )
+               length = sizeof(u_int32_t);
+
+       while ( length ) {
+               *dst++ = *src++;
+               length--;
+       }
+       return ret;
 }
-#endif
 
 int
 bdb_db_cache(
@@ -78,26 +86,31 @@ bdb_db_cache(
 
        rc = db_create( &db->bdi_db, bdb->bi_dbenv, 0 );
        if( rc != 0 ) {
+#ifdef NEW_LOGGING
+               LDAP_LOG ( CACHE, ERR, 
+                       "bdb_db_cache: db_create(%s) failed: %s (%d)\n", 
+                       bdb->bi_dbenv_home, db_strerror(rc), rc );
+#else
                Debug( LDAP_DEBUG_ANY,
                        "bdb_db_cache: db_create(%s) failed: %s (%d)\n",
                        bdb->bi_dbenv_home, db_strerror(rc), rc );
+#endif
                ldap_pvt_thread_mutex_unlock( &bdb->bi_database_mutex );
                return rc;
        }
 
        rc = db->bdi_db->set_pagesize( db->bdi_db, BDB_PAGESIZE );
-#if LUTIL_HASH_BYTES == 4
        rc = db->bdi_db->set_h_hash( db->bdi_db, bdb_db_hash );
-#endif
-#ifdef BDB_IDL_MULTI
        rc = db->bdi_db->set_flags( db->bdi_db, DB_DUP | DB_DUPSORT );
        rc = db->bdi_db->set_dup_compare( db->bdi_db, bdb_bt_compare );
-#endif
 
        file = ch_malloc( strlen( name ) + sizeof(BDB_SUFFIX) );
        sprintf( file, "%s" BDB_SUFFIX, name );
 
-       rc = db->bdi_db->open( db->bdi_db,
+#ifdef HAVE_EBCDIC
+       __atoe( file );
+#endif
+       rc = DB_OPEN( db->bdi_db,
                file, name,
                DB_HASH, bdb->bi_db_opflags | DB_CREATE | DB_THREAD,
                bdb->bi_dbenv_mode );
@@ -105,9 +118,15 @@ bdb_db_cache(
        ch_free( file );
 
        if( rc != 0 ) {
+#ifdef NEW_LOGGING
+               LDAP_LOG ( CACHE, ERR, 
+                       "bdb_db_cache: db_open(%s) failed: %s (%d)\n", 
+                       name, db_strerror(rc), rc );
+#else
                Debug( LDAP_DEBUG_ANY,
                        "bdb_db_cache: db_open(%s) failed: %s (%d)\n",
                        name, db_strerror(rc), rc );
+#endif
                ldap_pvt_thread_mutex_unlock( &bdb->bi_database_mutex );
                return rc;
        }