|
 |
dc8c34 |
From e18869e1e0a69005912b9609dab9ed9a0e106844 Mon Sep 17 00:00:00 2001
|
|
|
dc8c34 |
From: Noriko Hosoi <nhosoi@redhat.com>
|
|
|
dc8c34 |
Date: Mon, 30 Jun 2014 11:27:15 -0700
|
|
|
dc8c34 |
Subject: [PATCH 233/234] Ticket #47750 - Creating a glue fails if one above
|
|
|
dc8c34 |
level is a conflict or missing
|
|
|
dc8c34 |
|
|
|
dc8c34 |
Description: This commit accidentally removed the code to decrementing
|
|
|
dc8c34 |
the reference count for the backend instance.
|
|
|
dc8c34 |
Commit: 160cb3f686e433c01532d28770b2977ec957e73e
|
|
|
dc8c34 |
Ticket #47750 - Creating a glue fails if one above level is a conflict or missing;
|
|
|
dc8c34 |
Thanks to mreynolds@redhat.com for finding this out.
|
|
|
dc8c34 |
(cherry picked from commit 788a48fa98bb33a6601d7a198aa63b46d12ad78d)
|
|
|
dc8c34 |
(cherry picked from commit dfbc46a8574fdb5a2aef5a2ce1ea48400ba263aa)
|
|
|
dc8c34 |
(cherry picked from commit f18411d98a441f26f1ef2246b62e84b72ce39ec4)
|
|
|
dc8c34 |
(cherry picked from commit 30f1ba8154a4034137c3640007ee35cdb65131dd)
|
|
|
dc8c34 |
---
|
|
|
dc8c34 |
ldap/servers/slapd/back-ldbm/ldbm_delete.c | 4 +++-
|
|
|
dc8c34 |
1 file changed, 3 insertions(+), 1 deletion(-)
|
|
|
dc8c34 |
|
|
|
dc8c34 |
diff --git a/ldap/servers/slapd/back-ldbm/ldbm_delete.c b/ldap/servers/slapd/back-ldbm/ldbm_delete.c
|
|
|
dc8c34 |
index 32feeb1..1d2cbc3 100644
|
|
|
dc8c34 |
--- a/ldap/servers/slapd/back-ldbm/ldbm_delete.c
|
|
|
dc8c34 |
+++ b/ldap/servers/slapd/back-ldbm/ldbm_delete.c
|
|
|
dc8c34 |
@@ -1325,7 +1325,9 @@ common_return:
|
|
|
dc8c34 |
if (!delete_tombstone_entry) {
|
|
|
dc8c34 |
plugin_call_plugins (pb, SLAPI_PLUGIN_BE_POST_DELETE_FN);
|
|
|
dc8c34 |
}
|
|
|
dc8c34 |
-
|
|
|
dc8c34 |
+ if (inst && inst->inst_ref_count) {
|
|
|
dc8c34 |
+ slapi_counter_decrement(inst->inst_ref_count);
|
|
|
dc8c34 |
+ }
|
|
|
dc8c34 |
if (ruv_c_init) {
|
|
|
dc8c34 |
modify_term(&ruv_c, be);
|
|
|
dc8c34 |
}
|
|
|
dc8c34 |
--
|
|
|
dc8c34 |
1.8.1.4
|
|
|
dc8c34 |
|