upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2026-01-05 14:42:10 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix paged results limits

Browse source
This commit is contained in:
Pierangelo Masarati 2004-04-15 00:18:17 +00:00
parent 6b2347be6a
commit 165778483b
1 changed files with 9 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
servers/slapd/limits.c
View file

@ -683,6 +683,7 @@ limits_parse_one(
arg++;
if ( strcasecmp( arg, "none" ) == 0 ) {
limit->lms_t_soft = -1;
} else {
char *next = NULL;
@ -706,6 +707,7 @@ limits_parse_one(
arg += STRLENOF( "soft=" );
if ( strcasecmp( arg, "none" ) == 0 ) {
limit->lms_s_soft = -1;
} else {
char *next = NULL;
int soft = strtol( arg, &next, 10 );
@ -854,6 +856,7 @@ limits_parse_one(
arg++;
if ( strcasecmp( arg, "none" ) == 0 ) {
limit->lms_s_soft = -1;
} else {
char *next = NULL;
@ -944,6 +947,9 @@ limits_check( Operation *op, SlapReply *rs )
rs->sr_err = LDAP_SUCCESS;
rs->sr_text = NULL;
return -1;
} else if ( op->ors_limit->lms_s_pr_total == -1 ) {
slimit = -1;
} else {
/* if no limit is required, use soft limit */
@ -955,23 +961,7 @@ limits_check( Operation *op, SlapReply *rs )
/* if the limit is set, check that it does not violate any limit */
if ( op->ors_slimit > 0 ) {
slimit2 = op->ors_slimit;
if ( op->ors_limit->lms_s_pr_total > 0 ) {
if ( op->ors_slimit > op->ors_limit->lms_s_pr_total ) {
slimit2 = -2;
}
} else if ( op->ors_limit->lms_s_hard > 0 ) {
if ( op->ors_slimit > op->ors_limit->lms_s_hard ) {
slimit2 = -2;
}
} else if ( op->ors_limit->lms_s_soft > 0 ) {
if ( op->ors_slimit > op->ors_limit->lms_s_soft ) {
slimit2 = -2;
}
}
if ( slimit2 == -2 ) {
if ( op->ors_slimit > op->ors_limit->lms_s_pr_total ) {
rs->sr_err = LDAP_ADMINLIMIT_EXCEEDED;
send_ldap_result( op, rs );
rs->sr_err = LDAP_SUCCESS;
@ -979,15 +969,7 @@ limits_check( Operation *op, SlapReply *rs )
}
} else {
if ( op->ors_limit->lms_s_pr_total > 0 ) {
slimit2 = op->ors_limit->lms_s_pr_total;
} else if ( op->ors_limit->lms_s_hard > 0 ) {
slimit2 = op->ors_limit->lms_s_hard;
} else if ( op->ors_limit->lms_s_soft > 0 ) {
slimit2 = op->ors_limit->lms_s_soft;
}
slimit2 = op->ors_limit->lms_s_pr_total;
}
total = slimit2 - op->o_pagedresults_state.ps_count;
@ -1028,6 +1010,7 @@ limits_check( Operation *op, SlapReply *rs )
send_ldap_result( op, rs );
rs->sr_err = LDAP_SUCCESS;
return -1;
} else {
op->ors_slimit = slimit;
}