From: Pierangelo Masarati <ando@openldap.org>
Date: Fri, 7 Apr 2006 18:46:02 +0000 (+0000)
Subject: import fix for ITS#4479
X-Git-Tag: OPENLDAP_REL_ENG_2_3_21~2
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=02fea6377dd5f4758f1e4f8b96027ee9af2c1609;p=openldap

import fix for ITS#4479
---

diff --git a/CHANGES b/CHANGES
index 7ba1f45c07..038c9ec68e 100644
--- a/CHANGES
+++ b/CHANGES
@@ -12,6 +12,7 @@ OpenLDAP 2.3.21 Release
 	Fixed slapd connection index bound check (ITS#4449)
 	Fixed slapd connection cleanup (ITS#4465)
 	Fixed slapd slap_realloc misuse (ITS#4477)
+	Fixed slapd size limit check when pagesize=1 (ITS#4479)
 	Fixed slapd-bdb/hdb cache issue (ITS#4439)
 	Fixed slapd-ldbm crash on modify bug (ITS#4464)
 	Fixed slapd-ldap potential bind deadlock (ITS#4409)
diff --git a/servers/slapd/limits.c b/servers/slapd/limits.c
index 32cb842c1c..ef26010606 100644
--- a/servers/slapd/limits.c
+++ b/servers/slapd/limits.c
@@ -1233,6 +1233,9 @@ limits_check( Operation *op, SlapReply *rs )
 						return -1;
 					}
 					op->ors_slimit = slimit;
+
+				} else if ( slimit == 0 ) {
+					op->ors_slimit = 0;
 				}
 
 			} else {