From: Quanah Gibson-Mount <quanah@openldap.org>
Date: Thu, 15 Apr 2010 20:32:32 +0000 (+0000)
Subject: ITS#6484
X-Git-Tag: OPENLDAP_REL_ENG_2_4_22~61
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=69493b6fc387baf00e3ac2a5543b0e6b9cc3b787;p=openldap

ITS#6484
---

diff --git a/CHANGES b/CHANGES
index d493dee7a5..dc387d7c06 100644
--- a/CHANGES
+++ b/CHANGES
@@ -15,6 +15,7 @@ OpenLDAP 2.4.22 Engineering
 	Fixed slapo-collect REP_ENTRY flag handling (ITS#5340,ITS#6423)
 	Fixed slapo-dynlist REP_ENTRY flag handling (ITS#5340,ITS#6423)
 	Fixed slapo-pcache to release its own entries (ITS#6484)
+	Fixed slapo-rwm entry release handling (ITS#6484)
 	Fixed slapo-rwm olcRwmMap handling (ITS#6436)
 	Fixed slapo-rwm REP_ENTRY flag handling (ITS#5340,ITS#6423)
 	Fixed slapo-syncprov memory leak (ITS#6459)
diff --git a/servers/slapd/overlays/rwm.c b/servers/slapd/overlays/rwm.c
index f372e24ba8..882fbe3858 100644
--- a/servers/slapd/overlays/rwm.c
+++ b/servers/slapd/overlays/rwm.c
@@ -1512,7 +1512,9 @@ rwm_send_entry( Operation *op, SlapReply *rs )
 			goto fail;
 		}
 
-		overlay_entry_release_ov( op, rs->sr_entry, 0, on );
+		op->o_bd->bd_info = (BackendInfo *)on->on_info;
+		be_entry_release_r( op, rs->sr_entry );
+		op->o_bd->bd_info = (BackendInfo *)on;
 	}
 
 	rs->sr_entry = e;