From: Quanah Gibson-Mount <quanah@openldap.org>
Date: Wed, 26 Jan 2011 19:10:41 +0000 (+0000)
Subject: ITS#6795
X-Git-Tag: OPENLDAP_REL_ENG_2_4_24~65
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=a1786d6b3c4af07c3f21291c8955d907a4bc99f3;p=openldap

ITS#6795
---

diff --git a/CHANGES b/CHANGES
index c18aca4933..bde15fca03 100644
--- 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 9d99bacf55..7207e17c86 100644
--- 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;