/* $OpenLDAP$ */
/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
*
- * Copyright 2001-2004 The OpenLDAP Foundation.
+ * Copyright 2001-2011 The OpenLDAP Foundation.
* Portions Copyright 2001-2003 Pierangelo Masarati.
* All rights reserved.
*
Operation *op,
SlapReply *rs,
Entry *e_parent,
- int sub
-)
+ int sub )
{
- struct monitorinfo *mi =
- (struct monitorinfo *) op->o_bd->be_private;
- Entry *e, *e_tmp, *e_ch;
- struct monitorentrypriv *mp;
- int rc;
+ monitor_info_t *mi = ( monitor_info_t * )op->o_bd->be_private;
+ Entry *e,
+ *e_tmp,
+ *e_ch = NULL,
+ *e_nonvolatile = NULL;
+ monitor_entry_t *mp;
+ int rc,
+ nonvolatile = 0;
+
+ mp = ( monitor_entry_t * )e_parent->e_private;
+ e_nonvolatile = e = mp->mp_children;
- mp = ( struct monitorentrypriv * )e_parent->e_private;
- e = mp->mp_children;
-
- e_ch = NULL;
if ( MONITOR_HAS_VOLATILE_CH( mp ) ) {
- monitor_entry_create( op, NULL, e_parent, &e_ch );
+ monitor_entry_create( op, rs, NULL, e_parent, &e_ch );
}
monitor_cache_release( mi, e_parent );
if ( e_ch == NULL ) {
/* no persistent entries? return */
if ( e == NULL ) {
- return( 0 );
+ 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 {
e_tmp = e_ch;
do {
- mp = ( struct monitorentrypriv * )e_tmp->e_private;
+ mp = ( monitor_entry_t * )e_tmp->e_private;
e_tmp = mp->mp_next;
if ( e_tmp == NULL ) {
}
/* return entries */
- for ( ; e != NULL; ) {
- mp = ( struct monitorentrypriv * )e->e_private;
+ for ( monitor_cache_lock( e ); e != NULL; ) {
+ 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 );
+ rc = SLAPD_ABANDON;
+ goto freeout;
+ }
- monitor_entry_update( op, e );
-
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;
+ }
}
- if ( ( mp->mp_children || MONITOR_HAS_VOLATILE_CH( mp ) )
- && sub ) {
+ if ( sub ) {
rc = monitor_send_children( op, rs, e, sub );
if ( rc ) {
+freeout:
+ /* FIXME: may leak generated children */
+ 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( mi, 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 );
+
+ if ( !sub ) {
+ /* otherwise the recursive call already released */
+ monitor_cache_release( mi, e );
+ }
+
e = e_tmp;
}
- return( 0 );
+ return LDAP_SUCCESS;
}
int
monitor_back_search( Operation *op, SlapReply *rs )
{
- struct monitorinfo *mi
- = (struct monitorinfo *) op->o_bd->be_private;
+ monitor_info_t *mi = ( monitor_info_t * )op->o_bd->be_private;
int rc = LDAP_SUCCESS;
- Entry *e, *matched = NULL;
+ Entry *e = NULL, *matched = NULL;
+ slap_mask_t mask;
-#ifdef NEW_LOGGING
- LDAP_LOG( BACK_MON, ENTRY,
- "monitor_back_search: enter\n", 0, 0, 0 );
-#else
- Debug(LDAP_DEBUG_TRACE, "=> monitor_back_search\n%s%s%s", "", "", "");
-#endif
+ Debug( LDAP_DEBUG_TRACE, "=> monitor_back_search\n", 0, 0, 0 );
/* get entry with reader lock */
- monitor_cache_dn2entry( op, &op->o_req_ndn, &e, &matched );
+ monitor_cache_dn2entry( op, rs, &op->o_req_ndn, &e, &matched );
if ( e == NULL ) {
rs->sr_err = LDAP_NO_SUCH_OBJECT;
if ( matched ) {
- rs->sr_matched = matched->e_dn;
+ if ( !access_allowed_mask( op, matched,
+ slap_schema.si_ad_entry,
+ NULL, ACL_DISCLOSE, NULL, NULL ) )
+ {
+ /* do nothing */ ;
+ } else {
+ rs->sr_matched = matched->e_dn;
+ }
}
send_ldap_result( op, rs );
rs->sr_matched = NULL;
}
- return( 0 );
+ return rs->sr_err;
+ }
+
+ /* NOTE: __NEW__ "search" access is required
+ * on searchBase object */
+ if ( !access_allowed_mask( op, e, slap_schema.si_ad_entry,
+ NULL, ACL_SEARCH, NULL, &mask ) )
+ {
+ monitor_cache_release( mi, e );
+
+ if ( !ACL_GRANT( mask, ACL_DISCLOSE ) ) {
+ rs->sr_err = LDAP_NO_SUCH_OBJECT;
+ } else {
+ rs->sr_err = LDAP_INSUFFICIENT_ACCESS;
+ }
+
+ send_ldap_result( op, rs );
+
+ return rs->sr_err;
}
rs->sr_attrs = op->oq_search.rs_attrs;
switch ( op->oq_search.rs_scope ) {
case LDAP_SCOPE_BASE:
- monitor_entry_update( op, e );
+ monitor_entry_update( op, rs, e );
rc = test_filter( op, e, op->oq_search.rs_filter );
if ( rc == LDAP_COMPARE_TRUE ) {
rs->sr_entry = e;
break;
case LDAP_SCOPE_ONELEVEL:
- rc = monitor_send_children( op, rs, e, 0 );
- if ( rc ) {
- rc = LDAP_OTHER;
- }
-
+ case LDAP_SCOPE_SUBORDINATE:
+ rc = monitor_send_children( op, rs, e,
+ op->oq_search.rs_scope == LDAP_SCOPE_SUBORDINATE );
break;
case LDAP_SCOPE_SUBTREE:
- monitor_entry_update( op, e );
+ monitor_entry_update( op, rs, e );
rc = test_filter( op, e, op->oq_search.rs_filter );
if ( rc == LDAP_COMPARE_TRUE ) {
rs->sr_entry = e;
}
rc = monitor_send_children( op, rs, e, 1 );
- if ( rc ) {
- rc = LDAP_OTHER;
- }
-
break;
+
+ default:
+ rc = LDAP_UNWILLING_TO_PERFORM;
+ monitor_cache_release( mi, e );
}
-
+
rs->sr_attrs = NULL;
rs->sr_err = rc;
- send_ldap_result( op, rs );
+ if ( rs->sr_err != SLAPD_ABANDON ) {
+ send_ldap_result( op, rs );
+ }
- return( rc == LDAP_SUCCESS ? 0 : 1 );
+ return rs->sr_err;
}
projects / openldap / blobdiff