[openldap/f15] fix: DDS overlay tolerance parametr doesn't function and breakes default TTL

[jvcelak]

commit 21465371609261d34fba897180821b2f18f958da
Author: Jan Vcelak <jvcelak at redhat.com>
Date:   Wed Aug 24 19:01:05 2011 +0200

    fix: DDS overlay tolerance parametr doesn't function and breakes default TTL
    
    Resolves: #733069

 openldap-dds-overlay-tolerance.patch |   29 +++++++++++++++++++++++++++++
 openldap.spec                        |    3 +++
 2 files changed, 32 insertions(+), 0 deletions(-)
---
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 <jvcelak at redhat.com>
+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 484c0e2..89065b0 100644
--- a/openldap.spec
+++ b/openldap.spec
@@ -41,6 +41,7 @@ Patch18: openldap-nss-reqcert-hostname.patch
 Patch19: openldap-nss-verifycert.patch
 Patch20: openldap-nss-memleak-free-certs.patch
 Patch21: openldap-constraint-overlay-config.patch
+Patch22: openldap-dds-overlay-tolerance.patch
 
 # patches for the evolution library (see README.evolution)
 Patch200: openldap-evolution-ntlm.patch
@@ -154,6 +155,7 @@ pushd openldap-%{version}
 %patch19 -p1 -b .nss-verifycert
 %patch20 -p1 -b .nss-memleak-free-certs
 %patch21 -p1 -b .constraint-overlay-config
+%patch22 -p1 -b .dds-overlay-tolerance
 
 cp %{_datadir}/libtool/config/config.{sub,guess} build/
 
@@ -701,6 +703,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)
 
 * Tue Jun 28 2011 Jan Vcelak <jvcelak at redhat.com> 2.4.24-3
 - fix: openldap-servers scriptlets require initscripts package (#716857)