/* $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.
*
#include "back-monitor.h"
#include "proto-back-monitor.h"
-static int
-monitor_send_children(
- Operation *op,
- SlapReply *rs,
- Entry *e_parent,
- int sub
+static void
+monitor_find_children(
+ Operation *op,
+ SlapReply *rs,
+ Entry *e_parent,
+ Entry **nonv,
+ Entry **vol
)
{
- monitor_info_t *mi = ( monitor_info_t * )op->o_bd->be_private;
- Entry *e, *e_tmp, *e_ch;
monitor_entry_t *mp;
- int rc;
mp = ( monitor_entry_t * )e_parent->e_private;
- e = mp->mp_children;
+ *nonv = mp->mp_children;
- e_ch = NULL;
if ( MONITOR_HAS_VOLATILE_CH( mp ) ) {
- monitor_entry_create( op, rs, NULL, e_parent, &e_ch );
+ monitor_entry_create( op, rs, NULL, e_parent, vol );
}
- monitor_cache_release( mi, e_parent );
+}
+
+static int
+monitor_send_children(
+ Operation *op,
+ SlapReply *rs,
+ Entry *e_nonvolatile,
+ Entry *e_ch,
+ int sub )
+{
+ monitor_info_t *mi = ( monitor_info_t * )op->o_bd->be_private;
+ Entry *e,
+ *e_tmp;
+ monitor_entry_t *mp;
+ int rc,
+ nonvolatile = 0;
+
+ e = e_nonvolatile;
/* no volatile entries? */
if ( e_ch == NULL ) {
if ( e == NULL ) {
return LDAP_SUCCESS;
}
-
+
/* volatile entries */
} else {
/* if no persistent, return only volatile */
if ( e == NULL ) {
e = e_ch;
- monitor_cache_lock( e_ch );
/* else append persistent to volatile */
} else {
}
/* return entries */
- for ( ; e != NULL; ) {
- mp = ( monitor_entry_t * )e->e_private;
+ for ( ; e != NULL; e = e_tmp ) {
+ Entry *sub_nv = NULL, *sub_ch = NULL;
+ monitor_cache_lock( e );
monitor_entry_update( op, rs, e );
+ if ( e == e_nonvolatile )
+ nonvolatile = 1;
+
+ mp = ( monitor_entry_t * )e->e_private;
+ e_tmp = mp->mp_next;
+
if ( op->o_abandon ) {
monitor_cache_release( mi, e );
- return SLAPD_ABANDON;
+ rc = SLAPD_ABANDON;
+ goto freeout;
}
-
+
+ if ( sub )
+ monitor_find_children( op, rs, e, &sub_nv, &sub_ch );
+
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 );
- rs->sr_entry = NULL;
+ rs->sr_flags = REP_ENTRY_MUSTRELEASE;
+ rc = send_search_entry( op, rs );
+ if ( rc ) {
+ for ( e = sub_ch; e != NULL; e = sub_nv ) {
+ mp = ( monitor_entry_t * )e->e_private;
+ sub_nv = mp->mp_next;
+ monitor_cache_lock( e );
+ monitor_cache_release( mi, e );
+ }
+ goto freeout;
+ }
+ } else {
+ monitor_cache_release( mi, e );
}
- if ( ( mp->mp_children || MONITOR_HAS_VOLATILE_CH( mp ) )
- && sub )
- {
- rc = monitor_send_children( op, rs, e, sub );
+ if ( sub ) {
+ rc = monitor_send_children( op, rs, sub_nv, sub_ch, sub );
if ( rc ) {
- monitor_cache_release( mi, e );
+freeout:
+ if ( nonvolatile == 0 ) {
+ for ( ; e_tmp != NULL; ) {
+ mp = ( monitor_entry_t * )e_tmp->e_private;
+ e = e_tmp;
+ e_tmp = mp->mp_next;
+ monitor_cache_lock( e );
+ monitor_cache_release( mi, e );
+
+ if ( e_tmp == e_nonvolatile ) {
+ break;
+ }
+ }
+ }
+
return( rc );
}
}
-
- e_tmp = mp->mp_next;
- if ( e_tmp != NULL ) {
- monitor_cache_lock( e_tmp );
- }
- monitor_cache_release( mi, e );
- e = e_tmp;
}
return LDAP_SUCCESS;
monitor_info_t *mi = ( monitor_info_t * )op->o_bd->be_private;
int rc = LDAP_SUCCESS;
Entry *e = NULL, *matched = NULL;
+ Entry *e_nv = NULL, *e_ch = NULL;
slap_mask_t mask;
Debug( LDAP_DEBUG_TRACE, "=> monitor_back_search\n", 0, 0, 0 );
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;
}
}
{
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;
}
rc = test_filter( op, e, op->oq_search.rs_filter );
if ( rc == LDAP_COMPARE_TRUE ) {
rs->sr_entry = e;
- rs->sr_flags = 0;
+ rs->sr_flags = REP_ENTRY_MUSTRELEASE;
send_search_entry( op, rs );
rs->sr_entry = NULL;
+ } else {
+ monitor_cache_release( mi, e );
}
rc = LDAP_SUCCESS;
- monitor_cache_release( mi, e );
break;
case LDAP_SCOPE_ONELEVEL:
- rc = monitor_send_children( op, rs, e, 0 );
+ case LDAP_SCOPE_SUBORDINATE:
+ monitor_find_children( op, rs, e, &e_nv, &e_ch );
+ monitor_cache_release( mi, e );
+ rc = monitor_send_children( op, rs, e_nv, e_ch,
+ op->oq_search.rs_scope == LDAP_SCOPE_SUBORDINATE );
break;
case LDAP_SCOPE_SUBTREE:
monitor_entry_update( op, rs, e );
+ monitor_find_children( op, rs, e, &e_nv, &e_ch );
rc = test_filter( op, e, op->oq_search.rs_filter );
if ( rc == LDAP_COMPARE_TRUE ) {
rs->sr_entry = e;
- rs->sr_flags = 0;
+ rs->sr_flags = REP_ENTRY_MUSTRELEASE;
send_search_entry( op, rs );
rs->sr_entry = NULL;
+ } else {
+ monitor_cache_release( mi, e );
}
- rc = monitor_send_children( op, rs, e, 1 );
+ rc = monitor_send_children( op, rs, e_nv, e_ch, 1 );
break;
+
+ default:
+ rc = LDAP_UNWILLING_TO_PERFORM;
+ monitor_cache_release( mi, e );
}
rs->sr_attrs = NULL;
projects / openldap / blobdiff