ITS5261

diff --git a/CHANGES b/CHANGES
index 2daab2262fdb1ae4077e6c47cdfa8446dec0f355..34c50b9474eb16a301417c2fb93b01269508db65 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -12,6 +12,7 @@ OpenLDAP 2.4.8 Engineering
        Added slapo-autogroup contrib module (ITS#5145)
        Added slapo-constraint cross-attribute constraints (ITS#4987)
        Fixed slapo-ppolicy password checking when no policy required it (ITS#5285)
+       Fixed slapo-syncrepl hang on checkpoint (ITS#5261)
        Added slapo-translucent local searching (ITS#5283)
        Fixed test047 to skip if rwm is not available (ITS#5292)
        Build Environment

diff --git a/servers/slapd/overlays/syncprov.c b/servers/slapd/overlays/syncprov.c
index 45ae81a7f913448aaf498ea61d3689fe7c47b81a..6ed089f3c12c93d7ecf01817da960f5ea15c4d4c 100644 (file)
--- a/servers/slapd/overlays/syncprov.c
+++ b/servers/slapd/overlays/syncprov.c
@@ -1607,8 +1607,12 @@ syncprov_op_response( Operation *op, SlapReply *rs )
                        }
                        if ( si->si_chktime &&
                                (op->o_time - si->si_chklast >= si->si_chktime )) {
-                               do_check = 1;
-                               si->si_chklast = op->o_time;
+                               if ( si->si_chklast ) {
+                                       do_check = 1;
+                                       si->si_chklast = op->o_time;
+                               } else {
+                                       si->si_chklast = 1;
+                               }
                        }
                }
                ldap_pvt_thread_rdwr_wunlock( &si->si_csn_rwlock );