ITS#5339

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

diff --git a/servers/slapd/back-bdb/key.c b/servers/slapd/back-bdb/key.c
index 563489bccf1de236182db91d1ea45bf7643c75fe..6747d2930ac9ef7558c447a5bee1f4b3eee7dd65 100644 (file)
--- a/servers/slapd/back-bdb/key.c
+++ b/servers/slapd/back-bdb/key.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 2000-2004 The OpenLDAP Foundation.
+ * Copyright 2000-2008 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -30,7 +30,7 @@ int
 bdb_key_read(
        Backend *be,
        DB *db,
-       DB_TXN *txn,
+       BDB_LOCKER locker,
        struct berval *k,
        ID *ids,
        DBC **saved_cursor,
@@ -47,7 +47,7 @@ bdb_key_read(
        key.ulen = key.size;
        key.flags = DB_DBT_USERMEM;
 
-       rc = bdb_idl_fetch_key( be, db, txn, &key, ids, saved_cursor, get_flag );
+       rc = bdb_idl_fetch_key( be, db, locker, &key, ids, saved_cursor, get_flag );
 
        if( rc != LDAP_SUCCESS ) {
                Debug( LDAP_DEBUG_TRACE, "<= bdb_index_read: failed (%d)\n",
@@ -84,7 +84,13 @@ bdb_key_change(
 
        if (op == SLAP_INDEX_ADD_OP) {
                /* Add values */
-               rc = bdb_idl_insert_key( be, db, txn, &key, id );
+
+#ifdef BDB_TOOL_IDL_CACHING
+               if ( slapMode & SLAP_TOOL_QUICK )
+                       rc = bdb_tool_idl_add( be, db, txn, &key, id );
+               else
+#endif
+                       rc = bdb_idl_insert_key( be, db, txn, &key, id );
                if ( rc == DB_KEYEXIST ) rc = 0;
        } else {
                /* Delete values */