import fix for ITS#4479

diff --git a/CHANGES b/CHANGES
index 7ba1f45c072a7aa0e20945e74a0788d3ca8ea8fa..038c9ec68e9fafdd30ba828e1508b194a7851578 100644 (file)
--- 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 32cb842c1c6172a4e9460cd772d3e3b942b981d7..ef26010606c903621489aaa9215a57e115a68092 100644 (file)
--- 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 {