mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-01-06 10:46:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

ITS#6783 fix abandon processing, cleanup

Browse Source
This commit is contained in:
Howard Chu 2011-01-12 22:28:46 +00:00
parent 1ecaeb3b18
commit 758c6e4dc9
1 changed files with 12 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
servers/slapd/back-monitor/search.c
View File

@ -60,6 +60,7 @@ monitor_send_children(
if ( e == NULL ) {
return LDAP_SUCCESS;
}
nonvolatile = 1;
/* volatile entries */
} else {
@ -87,47 +88,36 @@ monitor_send_children(
for ( monitor_cache_lock( e ); e != NULL; ) {
monitor_entry_update( op, rs, e );
mp = ( monitor_entry_t * )e->e_private;
e_tmp = mp->mp_next;
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;
}
}
} else {
monitor_cache_release( mi, e );
}
return SLAPD_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;
rc = send_search_entry( op, rs );
rs->sr_entry = NULL;
if ( rc )
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 != 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 ) {