From e974279f4fcb11da5e4151ba2a4a2dc3319f8f4b Mon Sep 17 00:00:00 2001 From: Quanah Gibson-Mount Date: Tue, 10 Nov 2009 20:40:20 +0000 Subject: [PATCH] ITS#6370 --- CHANGES | 1 + servers/slapd/overlays/syncprov.c | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGES b/CHANGES index edbfcfcc3e..fdeb73eabb 100644 --- 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 8346169fd9..2a1c565e02 100644 --- 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 { -- 2.39.5