plug leaks

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

diff --git a/servers/slapd/back-bdb/tools.c b/servers/slapd/back-bdb/tools.c
index 09d25571ae0812c668d661fa39a83299656c7d1f..167f3c7e5e2b46d198a5e2114a5cba5933a87cf3 100644 (file)
--- a/servers/slapd/back-bdb/tools.c
+++ b/servers/slapd/back-bdb/tools.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 2000-2005 The OpenLDAP Foundation.
+ * Copyright 2000-2006 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -93,7 +93,8 @@ int bdb_tool_entry_open(
        }
 
        /* Set up for threaded slapindex */
-       if (( slapMode & (SLAP_TOOL_QUICK|SLAP_TOOL_READONLY)) == SLAP_TOOL_QUICK) {
+       if (( slapMode & (SLAP_TOOL_QUICK|SLAP_TOOL_READONLY)) == SLAP_TOOL_QUICK
+               && bdb->bi_nattrs ) {
                if ( !bdb_tool_info ) {
                        int i;
                        ldap_pvt_thread_mutex_init( &bdb_tool_index_mutex );
@@ -482,11 +483,11 @@ ID bdb_tool_entry_put(
                goto done;
        }
 
-       /* id2entry index */
-       rc = bdb_id2entry_add( be, tid, e );
+       if ( !bdb->bi_linear_index )
+               rc = bdb_tool_index_add( &op, tid, e );
        if( rc != 0 ) {
                snprintf( text->bv_val, text->bv_len,
-                               "id2entry_add failed: %s (%d)",
+                               "index_entry_add failed: %s (%d)",
                                db_strerror(rc), rc );
                Debug( LDAP_DEBUG_ANY,
                        "=> " LDAP_XSTRING(bdb_tool_entry_put) ": %s\n",
@@ -494,11 +495,11 @@ ID bdb_tool_entry_put(
                goto done;
        }
 
-       if ( !bdb->bi_linear_index )
-               rc = bdb_tool_index_add( &op, tid, e );
+       /* id2entry index */
+       rc = bdb_id2entry_add( be, tid, e );
        if( rc != 0 ) {
                snprintf( text->bv_val, text->bv_len,
-                               "index_entry_add failed: %s (%d)",
+                               "id2entry_add failed: %s (%d)",
                                db_strerror(rc), rc );
                Debug( LDAP_DEBUG_ANY,
                        "=> " LDAP_XSTRING(bdb_tool_entry_put) ": %s\n",
@@ -687,33 +688,6 @@ ID bdb_tool_entry_modify(
                goto done;
        }
 
-#if 0
-       /* FIXME: this is bogus, we don't have the old values to delete
-        * from the index because the given entry has already been modified.
-        */
-       rc = bdb_index_entry_del( &op, tid, e );
-       if( rc != 0 ) {
-               snprintf( text->bv_val, text->bv_len,
-                               "index_entry_del failed: %s (%d)",
-                               db_strerror(rc), rc );
-               Debug( LDAP_DEBUG_ANY,
-                       "=> " LDAP_XSTRING(bdb_tool_entry_modify) ": %s\n",
-                       text->bv_val, 0, 0 );
-               goto done;
-       }
-#endif
-
-       rc = bdb_index_entry_add( &op, tid, e );
-       if( rc != 0 ) {
-               snprintf( text->bv_val, text->bv_len,
-                               "index_entry_add failed: %s (%d)",
-                               db_strerror(rc), rc );
-               Debug( LDAP_DEBUG_ANY,
-                       "=> " LDAP_XSTRING(bdb_tool_entry_modify) ": %s\n",
-                       text->bv_val, 0, 0 );
-               goto done;
-       }
-
 done:
        if( rc == 0 ) {
                if (! (slapMode & SLAP_TOOL_QUICK)) {