ITS#6795

diff --git a/CHANGES b/CHANGES
index c18aca493312cbaeb65c70ce94cecf292bd69b37..bde15fca03e884180f0ce53c292d6d52f4729166 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -108,6 +108,7 @@ OpenLDAP 2.4.24 Engineering
        Fixed slapo-syncprov sessionlog with adds (ITS#6503)
        Fixed slapo-syncprov mutex (ITS#6438)
        Fixed slapo-syncprov mincsn check with MMR (ITS#6717)
+       Fixed slapo-syncprov control leak (ITS#6795)
        Fixed slapo-translucent entry leak (ITS#6746)
        Fixed contrib/autogroup LDAP URI with attribute filter (ITS#6536)
        Fixed contrib/autogroup install location (ITS#6684)

diff --git a/servers/slapd/overlays/syncprov.c b/servers/slapd/overlays/syncprov.c
index 9d99bacf55787fedad07212a39e0c0d429bef8fc..7207e17c868fa7761d4fafec8ebadc7399fe9b1a 100644 (file)
--- a/servers/slapd/overlays/syncprov.c
+++ b/servers/slapd/overlays/syncprov.c
@@ -2331,6 +2331,7 @@ syncprov_search_response( Operation *op, SlapReply *rs )
                rs->sr_ctrls = op->o_tmpalloc( sizeof(LDAPControl *)*2,
                        op->o_tmpmemctx );
                rs->sr_ctrls[1] = NULL;
+               rs->sr_flags |= REP_CTRLS_MUSTBEFREED;
                /* If we're in delta-sync mode, always send a cookie */
                if ( si->si_nopres && si->si_usehint && a ) {
                        struct berval cookie;