From: Quanah Gibson-Mount <quanah@openldap.org>
Date: Tue, 4 Jan 2011 19:58:53 +0000 (+0000)
Subject: ITS#6746
X-Git-Tag: OPENLDAP_REL_ENG_2_4_24~142
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=9357162590f9095154f905cede701ea435fdad09;p=openldap

ITS#6746
---

diff --git a/CHANGES b/CHANGES
index 35064db935..b67e3dc8cf 100644
--- a/CHANGES
+++ b/CHANGES
@@ -77,6 +77,7 @@ OpenLDAP 2.4.24 Engineering
 	Fixed slapo-syncprov to refresh if context is dirty (ITS#6710)
 	Fixed slapo-syncprov CSN updates to all replicas (ITS#6718)
 	Fixed slapo-syncprov sessionlog ordering (ITS#6716)
+	Fixed slapo-translucent entry leak (ITS#6746)
 	Fixed contrib/autogroup LDAP URI with attribute filter (ITS#6536)
 	Fixed contrib/nssov to only close socket on shutdown (ITS#6676)
 	Fixed contrib/nssov multi platform support (ITS#6604)
diff --git a/servers/slapd/overlays/translucent.c b/servers/slapd/overlays/translucent.c
index 2bbe357d38..63f283c009 100644
--- a/servers/slapd/overlays/translucent.c
+++ b/servers/slapd/overlays/translucent.c
@@ -1160,11 +1160,11 @@ static int translucent_search(Operation *op, SlapReply *rs) {
 			av = tavl_end( tc.list, TAVL_DIR_LEFT );
 			while ( av ) {
 				rs->sr_entry = av->avl_data;
-				rc = test_filter( op, rs->sr_entry, op->ors_filter );
-				if ( rc == LDAP_COMPARE_TRUE ) {
+				if ( rc == LDAP_SUCCESS && LDAP_COMPARE_TRUE ==
+					test_filter( op, rs->sr_entry, op->ors_filter ))
+				{
 					rs->sr_flags = REP_ENTRY_MUSTBEFREED;
 					rc = send_search_entry( op, rs );
-					if ( rc ) break;
 				} else {
 					entry_free( rs->sr_entry );
 				}