From e3c8beb8d08ee2996d1b108a4b18d79fab2d9f82 Mon Sep 17 00:00:00 2001
From: Howard Chu <hyc@openldap.org>
Date: Wed, 21 Dec 2016 14:39:47 +0000
Subject: [PATCH] Fix its6794 test

Must NULL out indexing cursors when closing tool txn
---
 servers/slapd/back-mdb/tools.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/servers/slapd/back-mdb/tools.c b/servers/slapd/back-mdb/tools.c
index 3d7154880e..8a70565350 100644
--- a/servers/slapd/back-mdb/tools.c
+++ b/servers/slapd/back-mdb/tools.c
@@ -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 ))) {
-- 
2.39.5