From: Howard Chu <hyc@openldap.org>
Date: Sun, 23 Nov 2008 22:36:52 +0000 (+0000)
Subject: ITS#5827
X-Git-Tag: OPENLDAP_REL_ENG_2_4_13~3
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=4debb1d381d215a04dd2e8d1a85812e047fa4511;p=openldap

ITS#5827
---

diff --git a/CHANGES b/CHANGES
index 45d76f5977..95a07fd1a1 100644
--- a/CHANGES
+++ b/CHANGES
@@ -68,6 +68,7 @@ OpenLDAP 2.4.13 Release (2008/11/20)
 	Fixed slapo-rwm entry get (ITS#5773)
 	Fixed slapo-syncprov runqueue removal (ITS#5776)
 	Fixed slapo-syncprov unreplicatable ops (ITS#5709)
+	Fixed slapo-syncprov psearch leak (ITS#5827)
 	Added slapo-translucent try local bind when remote fails (ITS#5656)
 	Added slapo-translucent support for PasswordModify exop (ITS#5656)
 	Fixed tools simple bind without SASL (ITS#5753)
diff --git a/servers/slapd/overlays/syncprov.c b/servers/slapd/overlays/syncprov.c
index 835ed240d7..64c5ffc243 100644
--- a/servers/slapd/overlays/syncprov.c
+++ b/servers/slapd/overlays/syncprov.c
@@ -1259,6 +1259,12 @@ syncprov_matchops( Operation *op, opcookie *opc, int saveit )
 			/* send DELETE */
 			syncprov_qresp( opc, ss, LDAP_SYNC_DELETE );
 		}
+		if ( !saveit && found ) {
+			/* Decrement s_inuse, was incremented when called
+			 * with saveit == TRUE
+			 */
+			syncprov_free_syncop( ss );
+		}
 	}
 	ldap_pvt_thread_mutex_unlock( &si->si_ops_mutex );