upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-12-27 10:09:43 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Don't decrement op->ors_slimit, just compare with rs->sr_nentries.

Browse source
This commit is contained in:
Howard Chu 2005-11-25 20:44:56 +00:00
parent 186b8700ae
commit 7a2f05016c
1 changed files with 5 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
servers/slapd/result.c
View file

@ -689,7 +689,11 @@ slap_send_search_entry( Operation *op, SlapReply *rs )
* e_flags: array of a_flags
*/
char **e_flags = NULL;
if ( op->ors_slimit >= 0 && rs->sr_nentries >= op->ors_slimit ) {
return SLAPD_SEND_SIZELIMIT;
}
rs->sr_type = REP_SEARCH;
/* eventually will loop through generated operational attribute types
@ -1125,15 +1129,6 @@ slap_send_search_entry( Operation *op, SlapReply *rs )
}
if ( op->o_res_ber == NULL ) {
if ( --op->ors_slimit == -1 ) {
rc = SLAPD_SEND_SIZELIMIT;
ber_free_buf( ber );
/* putback, so dumb backends that don't
* check sizelimit won't at least return
* more than expected... */
op->ors_slimit++;
goto error_return;
}
bytes = send_ldap_ber( op->o_conn, ber );
ber_free_buf( ber );