import selected fix from HEAD

diff --git a/CHANGES b/CHANGES
index 844df17211ea1f2abf8c4cdd5201e16bf9c55f99..e9e2801fc39c01d808d2fd856fe92f601be470e6 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -3,10 +3,11 @@ OpenLDAP 2.3 Change Log
 OpenLDAP 2.3.16 Engineering
        Fixed slapd-bdb reindexing via cn=config not noticed issue (ITS#4260)
        Fixed slapd-monitor connection search crash (ITS#4300)
-       Flapd slapd cn=config bad ACL syntax modfy crash (ITS#4306)
+       Flapd slapd cn=config bad ACL syntax modify crash (ITS#4306)
        Fixed slapd ACL/suffix configuration issue (ITS#4307)
        Fixed slapd-bdb/hdb cache issue (ITS#4308)
        Fixed slapd-bdb/hdb/ldbm suffix add with default referral issue (ITS#4310)
+       Fixed syncrepl time/size limit parsing
        Build environment
                Replace sched_yield(2) on Linux with select(2) (ITS#3950)
        Documentation

diff --git a/servers/slapd/syncrepl.c b/servers/slapd/syncrepl.c
index e91a393aeed9cc6ab03227fbbfea762f7f1d4044..6ede663b6ceeee8030e6e5680a27897effc22838 100644 (file)
--- a/servers/slapd/syncrepl.c
+++ b/servers/slapd/syncrepl.c
@@ -3061,7 +3061,7 @@ parse_syncrepl_line(
                        if ( strcasecmp( val, "unlimited" ) == 0 ) {
                                si->si_slimit = 0;
 
-                       } else if ( lutil_atoi( &si->si_slimit, val ) != 0 || val < 0 ) {
+                       } else if ( lutil_atoi( &si->si_slimit, val ) != 0 || si->si_slimit < 0 ) {
                                snprintf( c->msg, sizeof( c->msg ),
                                        "invalid size limit value \"%s\".\n",
                                        val );
@@ -3075,7 +3075,7 @@ parse_syncrepl_line(
                        if ( strcasecmp( val, "unlimited" ) == 0 ) {
                                si->si_tlimit = 0;
 
-                       } else if ( lutil_atoi( &si->si_tlimit, val ) != 0 || val < 0 ) {
+                       } else if ( lutil_atoi( &si->si_tlimit, val ) != 0 || si->si_tlimit < 0 ) {
                                snprintf( c->msg, sizeof( c->msg ),
                                        "invalid time limit value \"%s\".\n",
                                        val );