Merge remote branch 'origin/mdb.master' into OPENLDAP_REL_ENG_2_4

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

diff --git a/servers/slapd/back-mdb/tools.c b/servers/slapd/back-mdb/tools.c
index 12fba8c368c52f9392e176e5f4f6a068b42d551d..4a53962ecc883f7bbd38abf9c657c00bb3390a99 100644 (file)
--- a/servers/slapd/back-mdb/tools.c
+++ b/servers/slapd/back-mdb/tools.c
@@ -335,8 +335,10 @@ mdb_tool_entry_get_int( BackendDB *be, ID id, Entry **ep )
                rc = mdb_id2name( &op, txn, &idcursor, id, &dn, &ndn );
                if ( rc  ) {
                        rc = LDAP_OTHER;
-                       mdb_entry_return( &op, e );
-                       e = NULL;
+                       if ( e ) {
+                               mdb_entry_return( &op, e );
+                               e = NULL;
+                       }
                        goto done;
                }
                if ( tool_base != NULL ) {
@@ -369,7 +371,24 @@ Entry*
 mdb_tool_entry_get( BackendDB *be, ID id )
 {
        Entry *e = NULL;
+       int rc;
 
+       if ( !txn ) {
+               struct mdb_info *mdb = (struct mdb_info *) be->be_private;
+               rc = mdb_txn_begin( mdb->mi_dbenv, NULL,
+                       (slapMode & SLAP_TOOL_READONLY) ? MDB_RDONLY : 0, &txn );
+               if ( rc )
+                       return NULL;
+       }
+       if ( !cursor ) {
+               struct mdb_info *mdb = (struct mdb_info *) be->be_private;
+               rc = mdb_cursor_open( txn, mdb->mi_id2entry, &cursor );
+               if ( rc ) {
+                       mdb_txn_abort( txn );
+                       txn = NULL;
+                       return NULL;
+               }
+       }
        (void)mdb_tool_entry_get_int( be, id, &e );
        return e;
 }
@@ -764,22 +783,6 @@ int mdb_tool_entry_reindex(
                mi->mi_nattrs = i;
        }
 
-       if ( slapMode & SLAP_TRUNCATE_MODE ) {
-               int i;
-               for ( i=0; i < mi->mi_nattrs; i++ ) {
-                       rc = mdb_drop( txn, mi->mi_attrs[i]->ai_dbi, 0 );
-                       if ( rc ) {
-                               Debug( LDAP_DEBUG_ANY,
-                                       LDAP_XSTRING(mdb_tool_entry_reindex)
-                                       ": (Truncate) mdb_drop(%s) failed: %s (%d)\n",
-                                       mi->mi_attrs[i]->ai_desc->ad_type->sat_cname.bv_val,
-                                       mdb_strerror(rc), rc );
-                               return -1;
-                       }
-               }
-               slapMode ^= SLAP_TRUNCATE_MODE;
-       }
-
        e = mdb_tool_entry_get( be, id );
 
        if( e == NULL ) {
@@ -801,6 +804,22 @@ int mdb_tool_entry_reindex(
                }
        }
 
+       if ( slapMode & SLAP_TRUNCATE_MODE ) {
+               int i;
+               for ( i=0; i < mi->mi_nattrs; i++ ) {
+                       rc = mdb_drop( txi, mi->mi_attrs[i]->ai_dbi, 0 );
+                       if ( rc ) {
+                               Debug( LDAP_DEBUG_ANY,
+                                       LDAP_XSTRING(mdb_tool_entry_reindex)
+                                       ": (Truncate) mdb_drop(%s) failed: %s (%d)\n",
+                                       mi->mi_attrs[i]->ai_desc->ad_type->sat_cname.bv_val,
+                                       mdb_strerror(rc), rc );
+                               return -1;
+                       }
+               }
+               slapMode ^= SLAP_TRUNCATE_MODE;
+       }
+
        /*
         * just (re)add them for now
         * Use truncate mode to empty/reset index databases
@@ -862,7 +881,6 @@ ID mdb_tool_entry_modify(
 {
        int rc;
        struct mdb_info *mdb;
-       MDB_txn *tid;
        Operation op = {0};
        Opheader ohdr = {0};
 
@@ -885,15 +903,17 @@ ID mdb_tool_entry_modify(
                mdb_cursor_close( cursor );
                cursor = NULL;
        }
-       rc = mdb_txn_begin( mdb->mi_dbenv, NULL, 0, &tid );
-       if( rc != 0 ) {
-               snprintf( text->bv_val, text->bv_len,
-                       "txn_begin failed: %s (%d)",
-                       mdb_strerror(rc), rc );
-               Debug( LDAP_DEBUG_ANY,
-                       "=> " LDAP_XSTRING(mdb_tool_entry_modify) ": %s\n",
-                        text->bv_val, 0, 0 );
-               return NOID;
+       if ( !txn ) {
+               rc = mdb_txn_begin( mdb->mi_dbenv, NULL, 0, &txn );
+               if( rc != 0 ) {
+                       snprintf( text->bv_val, text->bv_len,
+                               "txn_begin failed: %s (%d)",
+                               mdb_strerror(rc), rc );
+                       Debug( LDAP_DEBUG_ANY,
+                               "=> " LDAP_XSTRING(mdb_tool_entry_modify) ": %s\n",
+                                text->bv_val, 0, 0 );
+                       return NOID;
+               }
        }
 
        op.o_hdr = &ohdr;
@@ -902,7 +922,7 @@ ID mdb_tool_entry_modify(
        op.o_tmpmfuncs = &ch_mfuncs;
 
        /* id2entry index */
-       rc = mdb_id2entry_update( &op, tid, NULL, e );
+       rc = mdb_id2entry_update( &op, txn, NULL, e );
        if( rc != 0 ) {
                snprintf( text->bv_val, text->bv_len,
                                "id2entry_update failed: err=%d", rc );
@@ -914,7 +934,7 @@ ID mdb_tool_entry_modify(
 
 done:
        if( rc == 0 ) {
-               rc = mdb_txn_commit( tid );
+               rc = mdb_txn_commit( txn );
                if( rc != 0 ) {
                        snprintf( text->bv_val, text->bv_len,
                                        "txn_commit failed: %s (%d)",
@@ -926,7 +946,7 @@ done:
                }
 
        } else {
-               mdb_txn_abort( tid );
+               mdb_txn_abort( txn );
                snprintf( text->bv_val, text->bv_len,
                        "txn_aborted! %s (%d)",
                        mdb_strerror(rc), rc );
@@ -935,6 +955,7 @@ done:
                        text->bv_val, 0, 0 );
                e->e_id = NOID;
        }
+       txn = NULL;
 
        return e->e_id;
 }