honor limits if below soft limit

diff --git a/servers/slapd/back-bdb/search.c b/servers/slapd/back-bdb/search.c
index 6297633eb87e173669b9778f3b1cc4dd843e3dc4..300424ff049083762bb13c03d24ed044d26ddecf 100644 (file)
--- a/servers/slapd/back-bdb/search.c
+++ b/servers/slapd/back-bdb/search.c
@@ -209,7 +209,7 @@ bdb_search(
                /* if requested limit higher than hard limit, abort */
                } else if ( tlimit > limit->lms_t_hard ) {
                        /* no hard limit means use soft instead */
-                       if ( limit->lms_t_hard == 0 ) {
+                       if ( limit->lms_t_hard == 0 && tlimit > limit->lms_t_soft ) {
                                tlimit = limit->lms_t_soft;
 
                        /* positive hard limit means abort */
@@ -231,7 +231,7 @@ bdb_search(
                /* if requested limit higher than hard limit, abort */
                } else if ( slimit > limit->lms_s_hard ) {
                        /* no hard limit means use soft instead */
-                       if ( limit->lms_s_hard == 0 ) {
+                       if ( limit->lms_s_hard == 0 && slimit > limit->lms_s_soft ) {
                                slimit = limit->lms_s_soft;
 
                        /* positive hard limit means abort */

diff --git a/servers/slapd/back-ldap/search.c b/servers/slapd/back-ldap/search.c
index 00777661d052ba729832cab1442df828a2c6c5a2..d85babb9cd512b844bbf9f3aa4dc1235d7747e63 100644 (file)
--- a/servers/slapd/back-ldap/search.c
+++ b/servers/slapd/back-ldap/search.c
@@ -99,7 +99,7 @@ ldap_back_search(
        /* if requested limit higher than hard limit, abort */
        if ( !isroot && tlimit > limit->lms_t_hard ) {
                /* no hard limit means use soft instead */
-               if ( limit->lms_t_hard == 0 ) {
+               if ( limit->lms_t_hard == 0 && tlimit > limit->lms_t_soft ) {
                        tlimit = limit->lms_t_soft;
                        
                /* positive hard limit means abort */
@@ -117,7 +117,7 @@ ldap_back_search(
        /* if requested limit higher than hard limit, abort */
        if ( !isroot && slimit > limit->lms_s_hard ) {
                /* no hard limit means use soft instead */
-               if ( limit->lms_s_hard == 0 ) {
+               if ( limit->lms_s_hard == 0 && slimit > limit->lms_s_soft ) {
                        slimit = limit->lms_s_soft;
                        
                /* positive hard limit means abort */

diff --git a/servers/slapd/back-ldbm/search.c b/servers/slapd/back-ldbm/search.c
index a82ffe7f90ba8fa805985bee8c543d56a13b9e40..3bdad07caa9bc114646a39b65b7a57a9b13c41ff 100644 (file)
--- a/servers/slapd/back-ldbm/search.c
+++ b/servers/slapd/back-ldbm/search.c
@@ -248,7 +248,7 @@ searchit:
                /* if requested limit higher than hard limit, abort */
                } else if ( tlimit > limit->lms_t_hard ) {
                        /* no hard limit means use soft instead */
-                       if ( limit->lms_t_hard == 0 ) {
+                       if ( limit->lms_t_hard == 0 && tlimit > limit->lms_t_soft ) {
                                tlimit = limit->lms_t_soft;
                        
                        /* positive hard limit means abort */
@@ -270,7 +270,7 @@ searchit:
                /* if requested limit higher than hard limit, abort */
                } else if ( slimit > limit->lms_s_hard ) {
                        /* no hard limit means use soft instead */
-                       if ( limit->lms_s_hard == 0 ) {
+                       if ( limit->lms_s_hard == 0 && slimit > limit->lms_s_soft ) {
                                slimit = limit->lms_s_soft;
 
                        /* positive hard limit means abort */

diff --git a/servers/slapd/back-meta/search.c b/servers/slapd/back-meta/search.c
index 6e8f2def32a9573479f6bc13d6f1eeec418dad25..7d00e2a2ff4cb5579f5145059a8a326b2a72c686 100644 (file)
--- a/servers/slapd/back-meta/search.c
+++ b/servers/slapd/back-meta/search.c
@@ -159,7 +159,7 @@ meta_back_search(
        /* if requested limit higher than hard limit, abort */
        if ( !isroot && tlimit > limit->lms_t_hard ) {
                /* no hard limit means use soft instead */
-               if ( limit->lms_t_hard == 0 ) {
+               if ( limit->lms_t_hard == 0 && tlimit > limit->lms_t_soft ) {
                        tlimit = limit->lms_t_soft;
                        
                /* positive hard limit means abort */
@@ -177,7 +177,7 @@ meta_back_search(
        /* if requested limit higher than hard limit, abort */
        if ( !isroot && slimit > limit->lms_s_hard ) {
                /* no hard limit means use soft instead */
-               if ( limit->lms_s_hard == 0 ) {
+               if ( limit->lms_s_hard == 0 && slimit > limit->lms_s_soft ) {
                        slimit = limit->lms_s_soft;
                        
                /* positive hard limit means abort */