From: Howard Chu <hyc@openldap.org>
Date: Fri, 16 May 2003 04:53:02 +0000 (+0000)
Subject: Additional fixes for ITS#2470
X-Git-Tag: OPENLDAP_REL_ENG_2_1_20~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ba43f4a8c62f8a3720479b6d5d64724d93e6ae50;p=thirdparty%2Fopenldap.git

Additional fixes for ITS#2470
---

diff --git a/servers/slapd/back-bdb/delete.c b/servers/slapd/back-bdb/delete.c
index c97bd6bb42..04a92369c2 100644
--- a/servers/slapd/back-bdb/delete.c
+++ b/servers/slapd/back-bdb/delete.c
@@ -59,6 +59,7 @@ bdb_delete(
 retry:	/* transaction retry */
 		if( e != NULL ) {
 			bdb_unlocked_cache_return_entry_w(&bdb->bi_cache, e);
+			e = NULL;
 		}
 #ifdef NEW_LOGGING
 		LDAP_LOG ( OPERATION, DETAIL1, 
diff --git a/servers/slapd/back-bdb/modify.c b/servers/slapd/back-bdb/modify.c
index caf9e8ccfc..e90ef7cf3e 100644
--- a/servers/slapd/back-bdb/modify.c
+++ b/servers/slapd/back-bdb/modify.c
@@ -305,6 +305,7 @@ retry:	/* transaction retry */
 		if( e != NULL ) {
 			bdb_cache_delete_entry(&bdb->bi_cache, e);
 			bdb_unlocked_cache_return_entry_w(&bdb->bi_cache, e);
+			e = NULL;
 		}
 #ifdef NEW_LOGGING
 		LDAP_LOG ( OPERATION, DETAIL1, "bdb_modify: retrying...\n", 0, 0, 0 );
diff --git a/servers/slapd/back-bdb/modrdn.c b/servers/slapd/back-bdb/modrdn.c
index 635b5217b7..fa58e600dc 100644
--- a/servers/slapd/back-bdb/modrdn.c
+++ b/servers/slapd/back-bdb/modrdn.c
@@ -131,7 +131,7 @@ retry:	/* transaction retry */
 			db_strerror(rc), rc, 0 );
 #else
 		Debug( LDAP_DEBUG_TRACE,
-			"bdb_delete: txn_begin failed: %s (%d)\n",
+			"bdb_modrdn: txn_begin failed: %s (%d)\n",
 			db_strerror(rc), rc, 0 );
 #endif
 		rc = LDAP_OTHER;