ITS#6058

diff --git a/CHANGES b/CHANGES
index d56548ef31e35c03db72db02e8d6043ba81cf79f..3be2095248f30a48a1096830ddf245c01b53f719 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -10,8 +10,9 @@ OpenLDAP 2.4.17 Engineering
        Fixed slapd normalization of updated schema attributes (ITS#5540)
        Fixed slapd pagedresults stacked control with overlays (ITS#6056)
        Fixed slapd sockets usage on windows (ITS#6039)
-       Fixed slapo-rwm dn passing (ITS#6070)
        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)
        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 93b1ae33b053ad019f74c7008c3e056c7c9a6345..3e6ba4952a1bcc7dc32c76bdf0f554d0c6efa648 100644 (file)
--- a/servers/slapd/overlays/rwm.c
+++ b/servers/slapd/overlays/rwm.c
@@ -823,7 +823,7 @@ rwm_entry_release_rw( Operation *op, Entry *e, int rw )
        }
 
        /* just free entry if (probably) ours */
-       if ( e->e_private == NULL ) {
+       if ( e->e_private == NULL && BER_BVISNULL( &e->e_bv ) ) {
                entry_free( e );
                return LDAP_SUCCESS;
        }