From: Pierangelo Masarati <ando@openldap.org>
Date: Thu, 17 Aug 2006 19:47:25 +0000 (+0000)
Subject: give slapd a chance to play callback cleanup handlers when a search operation is... 
X-Git-Tag: OPENLDAP_REL_ENG_2_4_3ALPHA~9^2~2
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=9c52a2c4ffe60d96f3f24e50f64c7df0f6b638b7;p=openldap

give slapd a chance to play callback cleanup handlers when a search operation is abandoned (ITS#4645)
---

diff --git a/servers/slapd/back-ldap/search.c b/servers/slapd/back-ldap/search.c
index 175341bc1e..97d4ee2c7a 100644
--- a/servers/slapd/back-ldap/search.c
+++ b/servers/slapd/back-ldap/search.c
@@ -469,7 +469,11 @@ finish:;
 		ldap_back_quarantine( op, rs );
 	}
 
-	if ( rc != SLAPD_ABANDON ) {
+#if 0
+	/* let send_ldap_result play cleanup handlers (ITS#4645) */
+	if ( rc != SLAPD_ABANDON )
+#endif
+	{
 		send_ldap_result( op, rs );
 	}
 
diff --git a/servers/slapd/back-meta/search.c b/servers/slapd/back-meta/search.c
index 623d5d8200..0a2efbeb53 100644
--- a/servers/slapd/back-meta/search.c
+++ b/servers/slapd/back-meta/search.c
@@ -1128,7 +1128,8 @@ really_bad:;
 
 			if ( op->o_abandon ) {
 				rc = SLAPD_ABANDON;
-				goto finish;
+				/* let send_ldap_result play cleanup handlers (ITS#4645) */
+				break;
 			}
 		}