upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2026-01-09 16:34:45 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

protocol only allows positive integers; remove checks

Browse source
This commit is contained in:
Pierangelo Masarati 2004-06-19 10:40:24 +00:00
parent 140d1f6e9b
commit 344edca731
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
servers/slapd/limits.c
View file

@ -993,6 +993,9 @@ limits_check( Operation *op, SlapReply *rs )
{
assert( op );
assert( rs );
/* protocol only allows 0..maxInt */
assert( op->ors_tlimit >= 0 );
assert( op->ors_slimit >= 0 );
/* FIXME: should this be always true? */
assert( op->o_tag == LDAP_REQ_SEARCH);
@ -1022,7 +1025,7 @@ limits_check( Operation *op, SlapReply *rs )
} else {
if ( op->ors_limit->lms_t_hard == 0 ) {
if ( op->ors_limit->lms_t_soft > 0
&& ( op->ors_tlimit < 0 || op->ors_tlimit > op->ors_limit->lms_t_soft ) ) {
&& ( op->ors_tlimit > op->ors_limit->lms_t_soft ) ) {
op->ors_tlimit = op->ors_limit->lms_t_soft;
}
@ -1030,7 +1033,7 @@ limits_check( Operation *op, SlapReply *rs )
if ( op->ors_tlimit == SLAP_MAX_LIMIT ) {
op->ors_tlimit = op->ors_limit->lms_t_hard;
} else if ( op->ors_tlimit < 0 || op->ors_tlimit > op->ors_limit->lms_t_hard ) {
} else if ( op->ors_tlimit > op->ors_limit->lms_t_hard ) {
/* error if exceeding hard limit */
rs->sr_err = LDAP_ADMINLIMIT_EXCEEDED;
send_ldap_result( op, rs );
@ -1106,14 +1109,11 @@ limits_check( Operation *op, SlapReply *rs )
if ( op->ors_slimit == SLAP_MAX_LIMIT ) {
slimit2 = op->ors_slimit = pr_total;
} else if ( op->ors_slimit > 0 ) {
slimit2 = op->ors_slimit;
} else if ( op->ors_slimit == 0 ) {
slimit2 = pr_total;
} else {
slimit2 = -1;
slimit2 = op->ors_slimit;
}
total = slimit2 - op->o_pagedresults_state.ps_count;
@ -1148,7 +1148,7 @@ limits_check( Operation *op, SlapReply *rs )
/* if got any limit, use it */
if ( slimit != -2 ) {
if ( op->ors_slimit <= 0 ) {
if ( op->ors_slimit == 0 ) {
op->ors_slimit = slimit;
} else if ( slimit > 0 ) {