give slapd a chance to play callback cleanup handlers when a search operation is...

diff --git a/servers/slapd/back-ldap/search.c b/servers/slapd/back-ldap/search.c
index 175341bc1ef0db60925a787d7095e7137546a81f..97d4ee2c7a87d6cfd5025e03a383ce0090968840 100644 (file)
--- 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 623d5d8200fa27356c8afed5ace666b0e6542fca..0a2efbeb53d24e17f4445cb3bedc987fd9ddc0d0 100644 (file)
--- 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;
                        }
                }