filter2bv can't de-normalize UUIDs, must do it explicitly for back-ldap

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

diff --git a/servers/slapd/back-bdb/key.c b/servers/slapd/back-bdb/key.c
index c84028542d2747eb102dd53f9081c218208142be..37fe1219e00de93512971ca005c7b80799233449 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-2006 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -32,7 +32,9 @@ bdb_key_read(
        DB *db,
        DB_TXN *txn,
        struct berval *k,
-       ID *ids
+       ID *ids,
+       DBC **saved_cursor,
+       int get_flag
 )
 {
        int rc;
@@ -45,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 );
+       rc = bdb_idl_fetch_key( be, db, txn, &key, ids, saved_cursor, get_flag );
 
        if( rc != LDAP_SUCCESS ) {
                Debug( LDAP_DEBUG_TRACE, "<= bdb_index_read: failed (%d)\n",
@@ -82,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 */