mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-01-06 10:46:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

move limits check and preparation in a helper function

Browse Source
This commit is contained in:
Pierangelo Masarati 2004-03-09 14:32:00 +00:00
parent d249714033
commit f145457d0c
3 changed files with 88 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

88
servers/slapd/limits.c
View File

@ -24,7 +24,7 @@
#include "slap.h" #include "slap.h"
int int
get_limits( limits_get(
Operation *op, Operation *op,
struct berval *ndn, struct berval *ndn,
struct slap_limits_set **limit struct slap_limits_set **limit
@ -165,7 +165,7 @@ get_limits(
} }
static int static int
add_limits( limits_add(
Backend *be, Backend *be,
unsigned flags, unsigned flags,
const char *pattern, const char *pattern,
@ -267,7 +267,7 @@ add_limits(
} }
int int
parse_limits( limits_parse(
Backend *be, Backend *be,
const char *fname, const char *fname,
int lineno, int lineno,
@ -539,7 +539,7 @@ no_ad:;
/* get the limits */ /* get the limits */
for ( i = 2; i < argc; i++ ) { for ( i = 2; i < argc; i++ ) {
if ( parse_limit( argv[i], &limit ) ) { if ( limits_parse_one( argv[i], &limit ) ) {
#ifdef NEW_LOGGING #ifdef NEW_LOGGING
LDAP_LOG( CONFIG, CRIT, LDAP_LOG( CONFIG, CRIT,
@ -572,7 +572,7 @@ no_ad:;
limit.lms_s_hard = limit.lms_s_soft; limit.lms_s_hard = limit.lms_s_soft;
} }
rc = add_limits( be, flags, pattern, group_oc, group_ad, &limit ); rc = limits_add( be, flags, pattern, group_oc, group_ad, &limit );
if ( rc ) { if ( rc ) {
#ifdef NEW_LOGGING #ifdef NEW_LOGGING
@ -592,7 +592,7 @@ no_ad:;
} }
int int
parse_limit( limits_parse_one(
const char *arg, const char *arg,
struct slap_limits_set *limit struct slap_limits_set *limit
) )
@ -770,3 +770,79 @@ parse_limit(
return 0; return 0;
} }
int
limits_check( Operation *op, SlapReply *rs )
{
/* allow root to set no limit */
if ( be_isroot( op->o_bd, &op->o_ndn ) ) {
op->ors_limit = NULL;
if ( op->ors_tlimit == 0 ) {
op->ors_tlimit = -1;
}
if ( op->ors_slimit == 0 ) {
op->ors_slimit = -1;
}
/* if not root, get appropriate limits */
} else {
( void ) limits_get( op, &op->o_ndn, &op->ors_limit );
assert( op->ors_limit != NULL );
/* if no limit is required, use soft limit */
if ( op->ors_tlimit <= 0 ) {
op->ors_tlimit = op->ors_limit->lms_t_soft;
/* if requested limit higher than hard limit, abort */
} else if ( op->ors_tlimit > op->ors_limit->lms_t_hard ) {
/* no hard limit means use soft instead */
if ( op->ors_limit->lms_t_hard == 0
&& op->ors_limit->lms_t_soft > -1
&& op->ors_tlimit > op->ors_limit->lms_t_soft ) {
op->ors_tlimit = op->ors_limit->lms_t_soft;
/* positive hard limit means abort */
} else if ( op->ors_limit->lms_t_hard > 0 ) {
rs->sr_err = LDAP_ADMINLIMIT_EXCEEDED;
send_ldap_result( op, rs );
rs->sr_err = LDAP_SUCCESS;
return -1;
}
/* negative hard limit means no limit */
}
/* if no limit is required, use soft limit */
if ( op->ors_slimit <= 0 ) {
if ( get_pagedresults( op ) && op->ors_limit->lms_s_pr != 0 ) {
op->ors_slimit = op->ors_limit->lms_s_pr;
} else {
op->ors_slimit = op->ors_limit->lms_s_soft;
}
/* if requested limit higher than hard limit, abort */
} else if ( op->ors_slimit > op->ors_limit->lms_s_hard ) {
/* no hard limit means use soft instead */
if ( op->ors_limit->lms_s_hard == 0
&& op->ors_limit->lms_s_soft > -1
&& op->ors_slimit > op->ors_limit->lms_s_soft ) {
op->ors_slimit = op->ors_limit->lms_s_soft;
/* positive hard limit means abort */
} else if ( op->ors_limit->lms_s_hard > 0 ) {
rs->sr_err = LDAP_ADMINLIMIT_EXCEEDED;
send_ldap_result( op, rs );
rs->sr_err = LDAP_SUCCESS;
return -1;
}
/* negative hard limit means no limit */
}
}
return 0;
}

8
servers/slapd/proto-slap.h
View File

@ -627,14 +627,16 @@ LDAP_SLAPD_F (int) slap_build_syncUUID_set LDAP_P((
/* /*
* limits.c * limits.c
*/ */
LDAP_SLAPD_F (int) get_limits LDAP_P(( LDAP_SLAPD_F (int) limits_get LDAP_P((
Operation *op, struct berval *ndn, Operation *op, struct berval *ndn,
struct slap_limits_set **limit )); struct slap_limits_set **limit ));
LDAP_SLAPD_F (int) parse_limits LDAP_P(( LDAP_SLAPD_F (int) limits_parse LDAP_P((
Backend *be, const char *fname, int lineno, Backend *be, const char *fname, int lineno,
int argc, char **argv )); int argc, char **argv ));
LDAP_SLAPD_F (int) parse_limit LDAP_P(( const char *arg, LDAP_SLAPD_F (int) limits_parse_one LDAP_P(( const char *arg,
struct slap_limits_set *limit )); struct slap_limits_set *limit ));
LDAP_SLAPD_F (int) limits_check LDAP_P((
Operation *op, SlapReply *rs ));
/* /*
* lock.c * lock.c

71
servers/slapd/search.c
View File

@ -397,77 +397,8 @@ do_search(
} }
#endif /* LDAP_SLAPI */ #endif /* LDAP_SLAPI */
/* allow root to set no limit */
if ( be_isroot( op->o_bd, &op->o_ndn ) ) {
op->ors_limit = NULL;
if ( op->ors_tlimit == 0 ) {
op->ors_tlimit = -1;
}
if ( op->ors_slimit == 0 ) {
op->ors_slimit = -1;
}
/* if not root, get appropriate limits */
} else {
( void ) get_limits( op, &op->o_ndn, &op->ors_limit );
assert( op->ors_limit != NULL );
/* if no limit is required, use soft limit */
if ( op->ors_tlimit <= 0 ) {
op->ors_tlimit = op->ors_limit->lms_t_soft;
/* if requested limit higher than hard limit, abort */
} else if ( op->ors_tlimit > op->ors_limit->lms_t_hard ) {
/* no hard limit means use soft instead */
if ( op->ors_limit->lms_t_hard == 0
&& op->ors_limit->lms_t_soft > -1
&& op->ors_tlimit > op->ors_limit->lms_t_soft ) {
op->ors_tlimit = op->ors_limit->lms_t_soft;
/* positive hard limit means abort */
} else if ( op->ors_limit->lms_t_hard > 0 ) {
rs->sr_err = LDAP_ADMINLIMIT_EXCEEDED;
send_ldap_result( op, rs );
rs->sr_err = LDAP_SUCCESS;
goto return_results;
}
/* negative hard limit means no limit */
}
/* if no limit is required, use soft limit */
if ( op->ors_slimit <= 0 ) {
if ( get_pagedresults( op ) && op->ors_limit->lms_s_pr != 0 ) {
op->ors_slimit = op->ors_limit->lms_s_pr;
} else {
op->ors_slimit = op->ors_limit->lms_s_soft;
}
/* if requested limit higher than hard limit, abort */
} else if ( op->ors_slimit > op->ors_limit->lms_s_hard ) {
/* no hard limit means use soft instead */
if ( op->ors_limit->lms_s_hard == 0
&& op->ors_limit->lms_s_soft > -1
&& op->ors_slimit > op->ors_limit->lms_s_soft ) {
op->ors_slimit = op->ors_limit->lms_s_soft;
/* positive hard limit means abort */
} else if ( op->ors_limit->lms_s_hard > 0 ) {
rs->sr_err = LDAP_ADMINLIMIT_EXCEEDED;
send_ldap_result( op, rs );
rs->sr_err = LDAP_SUCCESS;
goto return_results;
}
/* negative hard limit means no limit */
}
}
/* actually do the search and send the result(s) */ /* actually do the search and send the result(s) */
if ( op->o_bd->be_search ) { if ( op->o_bd->be_search && limits_check( op, rs ) == 0 ) {
(op->o_bd->be_search)( op, rs ); (op->o_bd->be_search)( op, rs );
} else { } else {
send_ldap_error( op, rs, LDAP_UNWILLING_TO_PERFORM, send_ldap_error( op, rs, LDAP_UNWILLING_TO_PERFORM,