From: Pierangelo Masarati <ando@openldap.org>
Date: Tue, 9 Mar 2004 14:32:00 +0000 (+0000)
Subject: move limits check and preparation in a helper function
X-Git-Tag: OPENLDAP_REL_ENG_2_2_BP~334
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=f145457d0c414b4a22bdf04bf32b825eeeff8eb2;p=openldap

move limits check and preparation in a helper function
---

diff --git a/servers/slapd/limits.c b/servers/slapd/limits.c
index 6b0953a3a1..64b36199bc 100644
--- a/servers/slapd/limits.c
+++ b/servers/slapd/limits.c
@@ -24,7 +24,7 @@
 #include "slap.h"
 
 int
-get_limits( 
+limits_get( 
 	Operation		*op,
 	struct berval		*ndn, 
 	struct slap_limits_set 	**limit
@@ -165,7 +165,7 @@ get_limits(
 }
 
 static int
-add_limits(
+limits_add(
 	Backend 	        *be,
 	unsigned		flags,
 	const char		*pattern,
@@ -267,7 +267,7 @@ add_limits(
 }
 
 int
-parse_limits(
+limits_parse(
 	Backend     *be,
 	const char  *fname,
 	int         lineno,
@@ -539,7 +539,7 @@ no_ad:;
 
 	/* get the limits */
 	for ( i = 2; i < argc; i++ ) {
-		if ( parse_limit( argv[i], &limit ) ) {
+		if ( limits_parse_one( argv[i], &limit ) ) {
 
 #ifdef NEW_LOGGING
 			LDAP_LOG( CONFIG, CRIT, 
@@ -572,7 +572,7 @@ no_ad:;
 		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 ) {
 
 #ifdef NEW_LOGGING
@@ -592,7 +592,7 @@ no_ad:;
 }
 
 int
-parse_limit(
+limits_parse_one(
 	const char 		*arg,
 	struct slap_limits_set 	*limit
 )
@@ -770,3 +770,79 @@ parse_limit(
 	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;
+}
+
diff --git a/servers/slapd/proto-slap.h b/servers/slapd/proto-slap.h
index d9e1aa0fca..7c4dbdec2d 100644
--- a/servers/slapd/proto-slap.h
+++ b/servers/slapd/proto-slap.h
@@ -627,14 +627,16 @@ LDAP_SLAPD_F (int) slap_build_syncUUID_set LDAP_P((
 /*
  * limits.c
  */
-LDAP_SLAPD_F (int) get_limits LDAP_P((
+LDAP_SLAPD_F (int) limits_get LDAP_P((
 	Operation *op, struct berval *ndn,
 	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,
 	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 ));
+LDAP_SLAPD_F (int) limits_check LDAP_P((
+	Operation *op, SlapReply *rs ));
 
 /*
  * lock.c
diff --git a/servers/slapd/search.c b/servers/slapd/search.c
index c5852c8590..ee168664bb 100644
--- a/servers/slapd/search.c
+++ b/servers/slapd/search.c
@@ -397,77 +397,8 @@ do_search(
 	}
 #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) */
-	if ( op->o_bd->be_search ) {
+	if ( op->o_bd->be_search && limits_check( op, rs ) == 0 ) {
 		(op->o_bd->be_search)( op, rs );
 	} else {
 		send_ldap_error( op, rs, LDAP_UNWILLING_TO_PERFORM,