From: Pierangelo Masarati <ando@openldap.org>
Date: Wed, 14 Mar 2007 01:07:56 +0000 (+0000)
Subject: fix search cleanup
X-Git-Tag: OPENLDAP_REL_ENG_2_3_35~33
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e1e21de1270b8cad6c36733253ec7dd1e54e1350;p=thirdparty%2Fopenldap.git

fix search cleanup
---

diff --git a/CHANGES b/CHANGES
index a7c316d3db..f5c0276503 100644
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,7 @@ OpenLDAP 2.3.35 Engineering
 	Fixed zero-length IA5string handling (ITS#4823)
 	Fixed slapd-bdb/hdb startup with missing shm env (ITS#4851)
 	Fixed slapd-ldap/meta consistency in referral proxying (ITS#4861)
+	Fixed slapd-meta search cleanup
 	Fixed slapd-meta/slapo-rwm filter mapping
 	Fixed slapd-sql subtree shortcut (ITS#4856)
 	Fixed slapo-refint config message (ITS#4853)
diff --git a/servers/slapd/back-meta/search.c b/servers/slapd/back-meta/search.c
index 5d6c7ea471..242d5a9576 100644
--- a/servers/slapd/back-meta/search.c
+++ b/servers/slapd/back-meta/search.c
@@ -303,6 +303,7 @@ down:;
 		if ( *mcp == NULL ) {
 			retcode = META_SEARCH_ERR;
 			rs->sr_err = LDAP_UNAVAILABLE;
+			candidates[ candidate ].sr_msgid = META_MSGID_IGNORE;
 			break;
 		}
 		/* fall thru */
@@ -614,6 +615,7 @@ retry:;
 
 		if ( *mcp == NULL ) {
 			retcode = META_SEARCH_ERR;
+			candidates[ candidate ].sr_msgid = META_MSGID_IGNORE;
 			break;
 		}
 		/* fall thru */