Add debug msg if adding entry to logDB fails

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

diff --git a/servers/slapd/back-mdb/tools.c b/servers/slapd/back-mdb/tools.c
index 3d7154880e798094159a7c1456120314428a7937..7cbea623954d02b995f74deeccbbc2e204fa926c 100644 (file)
--- a/servers/slapd/back-mdb/tools.c
+++ b/servers/slapd/back-mdb/tools.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 2011-2016 The OpenLDAP Foundation.
+ * Copyright 2011-2017 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -198,6 +198,14 @@ int mdb_tool_entry_close(
                mdb_cursor_close( cursor );
                cursor = NULL;
        }
+       {
+               struct mdb_info *mdb = be->be_private;
+               if ( mdb ) {
+                       int i;
+                       for (i=0; i<mdb->mi_nattrs; i++)
+                               mdb->mi_attrs[i]->ai_cursor = NULL;
+               }
+       }
        if( mdb_tool_txn ) {
                int rc;
                if (( rc = mdb_txn_commit( mdb_tool_txn ))) {
@@ -445,7 +453,6 @@ static int mdb_tool_next_id(
        struct berval *text,
        int hole )
 {
-       struct mdb_info *mdb = (struct mdb_info *) op->o_bd->be_private;
        struct berval dn = e->e_name;
        struct berval ndn = e->e_nname;
        struct berval pdn, npdn, nmatched;
@@ -1398,7 +1405,7 @@ int mdb_tool_idl_add(
        dbi = ai->ai_dbi;
        for (i=0; keys[i].bv_val; i++) {
        itmp.kstr = keys[i];
-       ic = tavl_find( (Avlnode *)ai->ai_root, &itmp, mdb_tool_idl_cmp );
+       ic = tavl_find( ai->ai_root, &itmp, mdb_tool_idl_cmp );
 
        /* No entry yet, create one */
        if ( !ic ) {
@@ -1420,7 +1427,7 @@ int mdb_tool_idl_add(
                ic->count = 0;
                ic->offset = 0;
                ic->flags = 0;
-               tavl_insert( (Avlnode **)&ai->ai_root, ic, mdb_tool_idl_cmp,
+               tavl_insert( &ai->ai_root, ic, mdb_tool_idl_cmp,
                        avl_dup_error );
 
                /* load existing key count here */
@@ -1509,7 +1516,6 @@ mdb_dn2id_upgrade( BackendDB *be ) {
        MDB_txn *mt;
        MDB_cursor *mc = NULL;
        MDB_val key, data;
-       char *ptr;
        int rc, writes=0, depth=0;
        int enable_meter = 0;
        ID id = 0, *num, count = 0;