diff --git a/openldap-dds-overlay-tolerance.patch b/openldap-dds-overlay-tolerance.patch new file mode 100644 index 0000000..d22b227 --- /dev/null +++ b/openldap-dds-overlay-tolerance.patch @@ -0,0 +1,29 @@ +DDS overlay: fix TTL tolerance + +olcDDStolerance setting had inverse effect and in fact was shortening entries real TTL + +From cca0da2163f1ec83352d86015cf6b9b42b757dc7 Mon Sep 17 00:00:00 2001 +Author: Jan Vcelak +Upstream ITS: #7017 +Resolves: #733069 + +--- + servers/slapd/overlays/dds.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/servers/slapd/overlays/dds.c b/servers/slapd/overlays/dds.c +index 56d299f..661b309 100644 +--- a/servers/slapd/overlays/dds.c ++++ b/servers/slapd/overlays/dds.c +@@ -156,7 +156,7 @@ dds_expire( void *ctx, dds_info_t *di ) + op->ors_slimit = SLAP_NO_LIMIT; + op->ors_attrs = slap_anlist_no_attrs; + +- expire = slap_get_time() + di->di_tolerance; ++ expire = slap_get_time() - di->di_tolerance; + ts.bv_val = tsbuf; + ts.bv_len = sizeof( tsbuf ); + slap_timestamp( &expire, &ts ); +-- +1.7.6 + diff --git a/openldap.spec b/openldap.spec index 3a30d66..0caa9e7 100644 --- a/openldap.spec +++ b/openldap.spec @@ -35,6 +35,7 @@ Patch9: openldap-nss-reqcert-hostname.patch Patch10: openldap-nss-verifycert.patch Patch11: openldap-nss-memleak-free-certs.patch Patch12: openldap-constraint-overlay-config.patch +Patch13: openldap-dds-overlay-tolerance.patch # patches for the evolution library (see README.evolution) Patch200: openldap-evolution-ntlm.patch @@ -140,6 +141,7 @@ pushd openldap-%{version} %patch10 -p1 -b .nss-verifycert %patch11 -p1 -b .nss-memleak-free-certs %patch12 -p1 -b .constraint-overlay-config +%patch13 -p1 -b .dds-overlay-tolerance cp %{_datadir}/libtool/config/config.{sub,guess} build/ @@ -669,6 +671,7 @@ exit 0 - fix: incorrect behavior of allow/try options of VerifyCert and TLS_REQCERT (#725819) - fix: memleak - free the return of tlsm_find_and_verify_cert_key (#725818) - fix: conversion of constraint overlay settings to cn=config is incorrect (#733067) +- fix: DDS overlay tolerance parametr doesn't function and breakes default TTL (#733069) * Sun Aug 14 2011 Rex Dieter - 2.4.26-1.1 - Rebuilt for rpm (#728707)