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

ITS#7657 honor unchecked limit

Browse Source
This commit is contained in:
Howard Chu 2019-07-17 10:17:43 +01:00
parent e90e8c7d3c
commit 92b03e82e0
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
servers/slapd/back-mdb/search.c
View File

@ -161,6 +161,12 @@ static int search_aliases(
if (rs->sr_err != LDAP_SUCCESS || MDB_IDL_IS_ZERO( aliases )) {
return rs->sr_err;
}
if ( op->ors_limit /* isroot == FALSE */ &&
op->ors_limit->lms_s_unchecked != -1 &&
MDB_IDL_N( aliases ) > (unsigned) op->ors_limit->lms_s_unchecked )
{
return LDAP_ADMINLIMIT_EXCEEDED;
}
oldsubs[0] = 1;
oldsubs[1] = e_id;
@ -670,6 +676,10 @@ dn2entry_retry:
scopes[1].mval.mv_data = NULL;
rs->sr_err = search_candidates( op, rs, base,
&isc, mci, candidates, stack );
if ( rs->sr_err == LDAP_ADMINLIMIT_EXCEEDED )
goto adminlimit;
ncand = MDB_IDL_N( candidates );
if ( !base->e_id || ncand == NOID ) {
/* grab entry count from id2entry stat
@ -700,6 +710,7 @@ dn2entry_retry:
ncand > (unsigned) op->ors_limit->lms_s_unchecked )
{
rs->sr_err = LDAP_ADMINLIMIT_EXCEEDED;
adminlimit:
send_ldap_result( op, rs );
rs->sr_err = LDAP_SUCCESS;
goto done;