ITS#6370

diff --git a/CHANGES b/CHANGES
index edbfcfcc3e8fc4916e4604f895a8fc5df8019674..fdeb73eabb278a98f56f2c1fc38ee8d572313f36 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -18,6 +18,7 @@ OpenLDAP 2.4.20 Engineering
        Fixed slapd-relay bind segfault (ITS#6337)
        Fixed slapo-memberof operational attr updates (ITS#6329)
        Fixed slapo-pcache entry dupe (ITS#6310)
+       Fixed slapo-syncprov checkpoint conversion (ITS#6370)
        Fixed slapo-syncprov deadlock (ITS#6335)
        Fixed slapo-syncprov out of order changes (ITS#6346)
        Build Environment

diff --git a/servers/slapd/overlays/syncprov.c b/servers/slapd/overlays/syncprov.c
index 8346169fd9c8b5b38fec0e43cccb6d2e22771e64..2a1c565e02d3ab277c4ee2a49e962e721554480d 100644 (file)
--- a/servers/slapd/overlays/syncprov.c
+++ b/servers/slapd/overlays/syncprov.c
@@ -2690,8 +2690,11 @@ sp_cf_gen(ConfigArgs *c)
                case SP_CHKPT:
                        if ( si->si_chkops || si->si_chktime ) {
                                struct berval bv;
+                               /* we assume si_chktime is a multiple of 60
+                                * because the parsed value was originally
+                                * multiplied by 60 */
                                bv.bv_len = snprintf( c->cr_msg, sizeof( c->cr_msg ),
-                                       "%d %d", si->si_chkops, si->si_chktime );
+                                       "%d %d", si->si_chkops, si->si_chktime/60 );
                                if ( bv.bv_len >= sizeof( c->cr_msg ) ) {
                                        rc = 1;
                                } else {