ITS#6484

diff --git a/CHANGES b/CHANGES
index d493dee7a5a861e72081fa7cbf88a9529b0c90f3..dc387d7c065fbe833aa7b65683e9610baa86b7f9 100644 (file)
--- 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 f372e24ba822811686a6315959d0347363e30357..882fbe38588c9623c740c5a4443e9cc367141029 100644 (file)
--- 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;