ldap/servers/slapd/back-ldbm/ldbm_delete.c | 11 ++---------
1 file changed, 2 insertions(+), 9 deletions(-)
New commits:
commit dca0b39baf1fb21db38da5e31c9ed46925ee76fd
Author: Mark Reynolds <mreynolds(a)redhat.com>
Date: Fri Dec 5 17:03:25 2014 -0500
Ticket 47834 - Fix cherry-pick for 1.3.1
Description: A cherry-pick was not cleanly applied to 1.3.1
https://fedorahosted.org/389/ticket/47834
diff --git a/ldap/servers/slapd/back-ldbm/ldbm_delete.c
b/ldap/servers/slapd/back-ldbm/ldbm_delete.c
index 90736b3..c06ca7d 100644
--- a/ldap/servers/slapd/back-ldbm/ldbm_delete.c
+++ b/ldap/servers/slapd/back-ldbm/ldbm_delete.c
@@ -1377,14 +1377,10 @@ common_return:
if (!delete_tombstone_entry) {
plugin_call_plugins (pb, SLAPI_PLUGIN_BE_POST_DELETE_FN);
}
-<<<<<<< HEAD
- if (e) {
- if (e_in_cache) {
-=======
+
/* Need to return to cache after post op plugins are called */
if (e) {
if (cache_is_in_cache(&inst->inst_cache, e)) {
->>>>>>> d9c8b1f... Ticket #47834 - Tombstone_to_glue: if parents are
also converted to glue, the target entry's DN must be adjusted.
if (remove_e_from_cache) {
/* The entry is already transformed to a tombstone. */
CACHE_REMOVE( &inst->inst_cache, e );
@@ -1392,11 +1388,8 @@ common_return:
}
cache_unlock_entry( &inst->inst_cache, e );
CACHE_RETURN( &inst->inst_cache, &e );
-<<<<<<< HEAD
+
/*
-=======
- /*
->>>>>>> d9c8b1f... Ticket #47834 - Tombstone_to_glue: if parents are
also converted to glue, the target entry's DN must be adjusted.
* e is unlocked and no longer in cache.
* It could be freed at any moment.
*/