ITS#6081

diff --git a/CHANGES b/CHANGES
index f5729548a64821dfa22422fffca64f5660474249..afe35295fb84874dd1ff4d12439bd951ff40b31e 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -15,6 +15,7 @@ OpenLDAP 2.4.17 Engineering
        Added slapo-rwm rwm-drop-unrequested-attrs config option (ITS#6057)
        Fixed slapo-rwm dn passing (ITS#6070)
        Fixed slapo-rwm entry free (ITS#6058)
+       Fixed slapo-rwm entry release (ITS#6081)
        Build Environment
                Added test056-monitor (ITS#5540)
                Added test057-memberof-refint (ITS#5395)

diff --git a/servers/slapd/overlays/rwm.c b/servers/slapd/overlays/rwm.c
index 3e6ba4952a1bcc7dc32c76bdf0f554d0c6efa648..09675bb004765641aa4facee11d98b7207354699 100644 (file)
--- a/servers/slapd/overlays/rwm.c
+++ b/servers/slapd/overlays/rwm.c
@@ -879,6 +879,8 @@ rwm_entry_get_rw( Operation *op, struct berval *ndn,
        op2.ors_attrs = slap_anlist_all_attributes;
        rc = op2.o_bd->bd_info->bi_entry_get_rw( &op2, &mndn, oc, at, rw, ep );
        if ( rc == LDAP_SUCCESS && *ep != NULL ) {
+               /* we assume be_entry_release() needs to be called */
+               rs.sr_flags = REP_ENTRY_MUSTRELEASE;
                rs.sr_entry = *ep;
 
                /* duplicate & release */