Minor cleanup

[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..f567618ed0b2259ff228adaa5634d45ee6174085 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-2011 The OpenLDAP Foundation.
  * Portions Copyright 2001-2003 Pierangelo Masarati.
  * All rights reserved.
  *
@@ -35,8 +35,7 @@ monitor_send_children(
        Operation       *op,
        SlapReply       *rs,
        Entry           *e_parent,
-       int             sub
-)
+       int             sub )
 {
        monitor_info_t  *mi = ( monitor_info_t * )op->o_bd->be_private;
        Entry                   *e,
@@ -61,7 +60,7 @@ monitor_send_children(
                if ( e == NULL ) {
                        return LDAP_SUCCESS;
                }
-       
+
        /* volatile entries */
        } else {
                /* if no persistent, return only volatile */
@@ -88,56 +87,47 @@ monitor_send_children(
        for ( monitor_cache_lock( e ); e != NULL; ) {
                monitor_entry_update( op, rs, e );
 
-               if ( op->o_abandon ) {
-                       /* FIXME: may leak generated children */
-                       if ( nonvolatile == 0 ) {
-                               for ( e_tmp = e; e_tmp != NULL; ) {
-                                       mp = ( monitor_entry_t * )e_tmp->e_private;
-                                       e = e_tmp;
-                                       e_tmp = mp->mp_next;
-                                       monitor_cache_release( mi, e );
-
-                                       if ( e_tmp == e_nonvolatile ) {
-                                               break;
-                                       }
-                               }
+               if ( e == e_nonvolatile )
+                       nonvolatile = 1;
 
-                       } else {
-                               monitor_cache_release( mi, e );
-                       }
+               mp = ( monitor_entry_t * )e->e_private;
+               e_tmp = mp->mp_next;
 
-                       return SLAPD_ABANDON;
+               if ( op->o_abandon ) {
+                       monitor_cache_release( mi, e );
+                       rc = SLAPD_ABANDON;
+                       goto freeout;
                }
-               
+
                rc = test_filter( op, e, op->oq_search.rs_filter );
                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;
+                       if ( rc ) {
+                               monitor_cache_release( mi, e );
+                               goto freeout;
+                       }
                }
 
-               mp = ( monitor_entry_t * )e->e_private;
-               e_tmp = mp->mp_next;
-
                if ( sub ) {
                        rc = monitor_send_children( op, rs, e, sub );
                        if ( rc ) {
+freeout:
                                /* 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;
+                                               monitor_cache_lock( mi, e );
                                                monitor_cache_release( mi, e );
        
                                                if ( e_tmp == e_nonvolatile ) {
                                                        break;
                                                }
                                        }
-
-                               } else {
-                                       monitor_cache_release( mi, e );
                                }
 
                                return( rc );
@@ -154,9 +144,6 @@ monitor_send_children(
                }
 
                e = e_tmp;
-               if ( e == e_nonvolatile ) {
-                       nonvolatile = 1;
-               }
        }
        
        return LDAP_SUCCESS;
@@ -178,15 +165,12 @@ monitor_back_search( Operation *op, SlapReply *rs )
        if ( e == NULL ) {
                rs->sr_err = LDAP_NO_SUCH_OBJECT;
                if ( matched ) {
-#ifdef SLAP_ACL_HONOR_DISCLOSE
                        if ( !access_allowed_mask( op, matched,
                                        slap_schema.si_ad_entry,
                                        NULL, ACL_DISCLOSE, NULL, NULL ) )
                        {
                                /* do nothing */ ;
-                       } else 
-#endif /* SLAP_ACL_HONOR_DISCLOSE */
-                       {
+                       } else {
                                rs->sr_matched = matched->e_dn;
                        }
                }
@@ -207,12 +191,9 @@ monitor_back_search( Operation *op, SlapReply *rs )
        {
                monitor_cache_release( mi, e );
 
-#ifdef SLAP_ACL_HONOR_DISCLOSE
                if ( !ACL_GRANT( mask, ACL_DISCLOSE ) ) {
                        rs->sr_err = LDAP_NO_SUCH_OBJECT;
-               } else 
-#endif /* SLAP_ACL_HONOR_DISCLOSE */
-               {
+               } else {
                        rs->sr_err = LDAP_INSUFFICIENT_ACCESS;
                }
 
@@ -237,7 +218,9 @@ monitor_back_search( Operation *op, SlapReply *rs )
                break;
 
        case LDAP_SCOPE_ONELEVEL:
-               rc = monitor_send_children( op, rs, e, 0 );
+       case LDAP_SCOPE_SUBORDINATE:
+               rc = monitor_send_children( op, rs, e,
+                       op->oq_search.rs_scope == LDAP_SCOPE_SUBORDINATE );
                break;
 
        case LDAP_SCOPE_SUBTREE:
@@ -252,6 +235,10 @@ monitor_back_search( Operation *op, SlapReply *rs )
 
                rc = monitor_send_children( op, rs, e, 1 );
                break;
+
+       default:
+               rc = LDAP_UNWILLING_TO_PERFORM;
+               monitor_cache_release( mi, e );
        }
 
        rs->sr_attrs = NULL;