summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRich Megginson <rmeggins@redhat.com>2010-08-03 13:59:15 -0600
committerRich Megginson <rmeggins@redhat.com>2010-08-03 14:10:35 -0600
commit84e6cc2ffd7a3aa684959d22e6fc2ab3a15791de (patch)
tree16b76b82cdd41fbf7c40bbc8481598693e2437c4
parent271943190d35c65c9333875701492efe42287f41 (diff)
downloadds-84e6cc2ffd7a3aa684959d22e6fc2ab3a15791de.tar.gz
ds-84e6cc2ffd7a3aa684959d22e6fc2ab3a15791de.tar.xz
ds-84e6cc2ffd7a3aa684959d22e6fc2ab3a15791de.zip
Bug 617862 - Replication: Unable to delete tombstone errors389-ds-base-1.2.6.rc6
https://bugzilla.redhat.com/show_bug.cgi?id=617862 Resolves: bug 617862 Bug Description: Replication: Unable to delete tombstone errors Reviewed by: nhosoi (Thanks!) Branch: 389-ds-base-1.2.6 Fix Description: In the case of deletion of a tombstone entry, the target entry 'e' is the tombstone entry. 'tombstone' is not used for this purpose. Platforms tested: RHEL5 x86_64 Flag Day: no Doc impact: no
-rw-r--r--ldap/servers/slapd/back-ldbm/ldbm_delete.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/ldap/servers/slapd/back-ldbm/ldbm_delete.c b/ldap/servers/slapd/back-ldbm/ldbm_delete.c
index 3c745f16..36ded0c9 100644
--- a/ldap/servers/slapd/back-ldbm/ldbm_delete.c
+++ b/ldap/servers/slapd/back-ldbm/ldbm_delete.c
@@ -751,7 +751,7 @@ ldbm_back_delete( Slapi_PBlock *pb )
if (entryrdn_get_switch()) /* subtree-rename: on */
{
retval =
- entryrdn_index_entry(be, tombstone, BE_INDEX_DEL, &txn);
+ entryrdn_index_entry(be, e, BE_INDEX_DEL, &txn);
if (DB_LOCK_DEADLOCK == retval) {
LDAPDebug0Args( LDAP_DEBUG_ARGS,
"delete (deleting entryrdn) DB_LOCK_DEADLOCK\n");