X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-monitor%2Fsearch.c;h=29ac90ab32332115c2c2cb4278a2c874a2b46578;hb=b905811d3c800b6f4031d541e424e5de871aa0c7;hp=591287d06cfc73777e2d4fe2c93b4bb44d903eb2;hpb=77ad940c10f32cb6c6f68944da2049a86d850bf4;p=openldap diff --git a/servers/slapd/back-monitor/search.c b/servers/slapd/back-monitor/search.c index 591287d06c..29ac90ab32 100644 --- 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 . * - * Copyright 2001-2005 The OpenLDAP Foundation. + * Copyright 2001-2011 The OpenLDAP Foundation. * Portions Copyright 2001-2003 Pierangelo Masarati. * All rights reserved. * @@ -30,30 +30,41 @@ #include "back-monitor.h" #include "proto-back-monitor.h" +static void +monitor_find_children( + Operation *op, + SlapReply *rs, + Entry *e_parent, + Entry **nonv, + Entry **vol +) +{ + monitor_entry_t *mp; + + mp = ( monitor_entry_t * )e_parent->e_private; + *nonv = mp->mp_children; + + if ( MONITOR_HAS_VOLATILE_CH( mp ) ) { + monitor_entry_create( op, rs, NULL, e_parent, vol ); + } +} + static int monitor_send_children( Operation *op, SlapReply *rs, - Entry *e_parent, - int sub -) + Entry *e_nonvolatile, + Entry *e_ch, + int sub ) { monitor_info_t *mi = ( monitor_info_t * )op->o_bd->be_private; Entry *e, - *e_tmp, - *e_ch = NULL, - *e_nonvolatile = NULL; + *e_tmp; monitor_entry_t *mp; int rc, nonvolatile = 0; - mp = ( monitor_entry_t * )e_parent->e_private; - e_nonvolatile = e = mp->mp_children; - - if ( MONITOR_HAS_VOLATILE_CH( mp ) ) { - monitor_entry_create( op, rs, NULL, e_parent, &e_ch ); - } - monitor_cache_release( mi, e_parent ); + e = e_nonvolatile; /* no volatile entries? */ if ( e_ch == NULL ) { @@ -61,7 +72,7 @@ monitor_send_children( if ( e == NULL ) { return LDAP_SUCCESS; } - + /* volatile entries */ } else { /* if no persistent, return only volatile */ @@ -85,50 +96,55 @@ monitor_send_children( } /* return entries */ - for ( monitor_cache_lock( e ); e != NULL; ) { - monitor_entry_update( op, rs, e ); + for ( ; e != NULL; e = e_tmp ) { + Entry *sub_nv = NULL, *sub_ch = NULL; - 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 ); + monitor_cache_lock( e ); + monitor_entry_update( op, rs, 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; } - + + 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 ); } - mp = ( monitor_entry_t * )e->e_private; - e_tmp = mp->mp_next; - if ( sub ) { - rc = monitor_send_children( op, rs, e, sub ); + rc = monitor_send_children( op, rs, sub_nv, sub_ch, sub ); if ( rc ) { - /* FIXME: may leak generated children */ +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 ) { @@ -140,20 +156,6 @@ monitor_send_children( return( rc ); } } - - if ( e_tmp != NULL ) { - monitor_cache_lock( e_tmp ); - } - - if ( !sub ) { - /* otherwise the recursive call already released */ - monitor_cache_release( mi, e ); - } - - e = e_tmp; - if ( e == e_nonvolatile ) { - nonvolatile = 1; - } } return LDAP_SUCCESS; @@ -165,6 +167,7 @@ monitor_back_search( Operation *op, SlapReply *rs ) 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 ); @@ -175,15 +178,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; } } @@ -204,12 +204,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; } @@ -225,30 +222,42 @@ monitor_back_search( Operation *op, SlapReply *rs ) 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;