mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2024-12-21 03:10:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix and improve previous commit

Browse Source
This commit is contained in:
Pierangelo Masarati 2003-04-07 08:53:03 +00:00
parent a9fd63c156
commit 504eb61495
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -112,10 +112,8 @@ monitor_send_children(
rc = test_filter( op, e, op->oq_search.rs_filter ); rc = test_filter( op, e, op->oq_search.rs_filter );
if ( rc == LDAP_COMPARE_TRUE ) { if ( rc == LDAP_COMPARE_TRUE ) {
rs->sr_entry = e; rs->sr_entry = e;
rs->sr_attrs = attrs;
send_search_entry( op, rs ); send_search_entry( op, rs );
rs->sr_entry = NULL; rs->sr_entry = NULL;
rs->sr_attrs = NULL;
} }
if ( ( mp->mp_children || MONITOR_HAS_VOLATILE_CH( mp ) ) if ( ( mp->mp_children || MONITOR_HAS_VOLATILE_CH( mp ) )
@ -168,16 +166,15 @@ monitor_back_search( Operation *op, SlapReply *rs )
return( 0 ); return( 0 );
} }
rs->sr_attrs = op->oq_search.rs_attrs;
switch ( op->oq_search.rs_scope ) { switch ( op->oq_search.rs_scope ) {
case LDAP_SCOPE_BASE: case LDAP_SCOPE_BASE:
monitor_entry_update( mi, e ); monitor_entry_update( mi, e );
rc = test_filter( op, e, op->oq_search.rs_filter ); rc = test_filter( op, e, op->oq_search.rs_filter );
if ( rc == LDAP_COMPARE_TRUE ) { if ( rc == LDAP_COMPARE_TRUE ) {
rs->sr_entry = e; rs->sr_entry = e;
rs->sr_attrs = attrs;
send_search_entry( op, rs ); send_search_entry( op, rs );
rs->sr_entry = NULL; rs->sr_entry = NULL;
rs->sr_attrs = NULL;
} }
rc = LDAP_SUCCESS; rc = LDAP_SUCCESS;
monitor_cache_release( mi, e ); monitor_cache_release( mi, e );
@ -196,10 +193,8 @@ monitor_back_search( Operation *op, SlapReply *rs )
rc = test_filter( op, e, op->oq_search.rs_filter ); rc = test_filter( op, e, op->oq_search.rs_filter );
if ( rc == LDAP_COMPARE_TRUE ) { if ( rc == LDAP_COMPARE_TRUE ) {
rs->sr_entry = e; rs->sr_entry = e;
rs->sr_attrs = attrs;
send_search_entry( op, rs ); send_search_entry( op, rs );
rs->sr_entry = NULL; rs->sr_entry = NULL;
rs->sr_attrs = NULL;
} }
rc = monitor_send_children( op, rs, e, 1 ); rc = monitor_send_children( op, rs, e, 1 );
@ -210,6 +205,7 @@ monitor_back_search( Operation *op, SlapReply *rs )
break; break;
} }
rs->sr_attrs = NULL;
rs->sr_err = rc; rs->sr_err = rc;
send_ldap_result( op, rs ); send_ldap_result( op, rs );