Bug 617862 - Replication: Unable to delete tombstone errors

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: master
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
(cherry picked from commit 84e6cc2ffd7a3aa684959d22e6fc2ab3a15791de)

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");