From: Quanah Gibson-Mount <quanah@openldap.org>
Date: Sat, 9 Feb 2008 01:08:01 +0000 (+0000)
Subject: ITS5261
X-Git-Tag: OPENLDAP_REL_ENG_2_4_8~121
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=5a6cd2403f70be749037464a1ffd4ca1b8e1b4ea;p=openldap

ITS5261
---

diff --git a/CHANGES b/CHANGES
index 2daab2262f..34c50b9474 100644
--- 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 45ae81a7f9..6ed089f3c1 100644
--- 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 );