Additional fixes for ITS#2470

diff --git a/servers/slapd/back-bdb/delete.c b/servers/slapd/back-bdb/delete.c
index c97bd6bb42c0d1a356fdac4e295c97071b64d146..04a92369c2fccc06b2fa6f088cf3795dc5e8f780 100644 (file)
--- 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 caf9e8ccfc5e5eb7960de2fdb1533ef14a31c8d4..e90ef7cf3ef8a9b443dec67c278559caedb4f4ae 100644 (file)
--- 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 635b5217b76b08e2c214838fb531c8862460e3a1..fa58e600dcc70b421ffcdfe98403aaa10ec94045 100644 (file)
--- 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;