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

Don't touch op->ors_slimit.

Browse source
This commit is contained in:
Howard Chu 2005-11-25 20:50:34 +00:00
parent 7a2f05016c
commit 255f1e494f
1 changed files with 1 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
servers/slapd/backglue.c
View file

@ -79,7 +79,6 @@ glue_back_select (
typedef struct glue_state {
int err;
int slimit;
int matchlen;
char *matched;
int nrefs;
@ -93,13 +92,6 @@ glue_op_response ( Operation *op, SlapReply *rs )
switch(rs->sr_type) {
case REP_SEARCH:
if ( gs->slimit != SLAP_NO_LIMIT
&& rs->sr_nentries >= gs->slimit )
{
rs->sr_err = gs->err = LDAP_SIZELIMIT_EXCEEDED;
return -1;
}
/* fallthru */
case REP_SEARCHREF:
return SLAP_CB_CONTINUE;
@ -244,7 +236,7 @@ glue_op_search ( Operation *op, SlapReply *rs )
long stoptime = 0;
glue_state gs = {0, 0, 0, NULL, 0, NULL};
slap_callback cb = { NULL, glue_op_response, NULL, NULL };
int scope0, slimit0, tlimit0;
int scope0, tlimit0;
struct berval dn, ndn, *pdn;
cb.sc_private = &gs;
@ -285,7 +277,6 @@ glue_op_search ( Operation *op, SlapReply *rs )
op->o_callback = &cb;
rs->sr_err = gs.err = LDAP_UNWILLING_TO_PERFORM;
scope0 = op->ors_scope;
slimit0 = gs.slimit = op->ors_slimit;
tlimit0 = op->ors_tlimit;
dn = op->o_req_dn;
ndn = op->o_req_ndn;
@ -313,13 +304,6 @@ glue_op_search ( Operation *op, SlapReply *rs )
break;
}
}
if (slimit0 != SLAP_NO_LIMIT) {
op->ors_slimit = slimit0 - rs->sr_nentries;
if (op->ors_slimit < 0) {
rs->sr_err = gs.err = LDAP_SIZELIMIT_EXCEEDED;
break;
}
}
rs->sr_err = 0;
/*
* check for abandon
@ -380,7 +364,6 @@ glue_op_search ( Operation *op, SlapReply *rs )
}
end_of_loop:;
op->ors_scope = scope0;
op->ors_slimit = slimit0;
op->ors_tlimit = tlimit0;
op->o_req_dn = dn;
op->o_req_ndn = ndn;