address ITS#4332; might remove dynamicObject counting

[openldap] / servers / slapd / back-monitor / search.c

diff --git a/servers/slapd/back-monitor/search.c b/servers/slapd/back-monitor/search.c
index db3d6ab5be7a2823bf8bfa1305ed29e40662697c..e71afa20b0567be706392d2deeaebeea3cfe0484 100644 (file)
--- a/servers/slapd/back-monitor/search.c
+++ b/servers/slapd/back-monitor/search.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 2001-2005 The OpenLDAP Foundation.
+ * Copyright 2001-2006 The OpenLDAP Foundation.
  * Portions Copyright 2001-2003 Pierangelo Masarati.
  * All rights reserved.
  *
@@ -113,7 +113,7 @@ monitor_send_children(
                if ( rc == LDAP_COMPARE_TRUE ) {
                        rs->sr_entry = e;
                        rs->sr_flags = 0;
-                       send_search_entry( op, rs );
+                       rc = send_search_entry( op, rs );
                        rs->sr_entry = NULL;
                }
 
@@ -125,7 +125,7 @@ monitor_send_children(
                        if ( rc ) {
                                /* FIXME: may leak generated children */
                                if ( nonvolatile == 0 ) {
-                                       for ( e_tmp = e; e_tmp != NULL; ) {
+                                       for ( ; e_tmp != NULL; ) {
                                                mp = ( monitor_entry_t * )e_tmp->e_private;
                                                e = e_tmp;
                                                e_tmp = mp->mp_next;
@@ -135,9 +135,6 @@ monitor_send_children(
                                                        break;
                                                }
                                        }
-
-                               } else {
-                                       monitor_cache_release( mi, e );
                                }
 
                                return( rc );