Blame SOURCES/0028-BZ1518320-entry-cache-crash-fix.patch

c04070
From 12672d5bad1b1bbb71a281d33533b1829ab65fbc Mon Sep 17 00:00:00 2001
c04070
From: Mark Reynolds <mreynolds@redhat.com>
c04070
Date: Fri, 21 Jun 2019 10:15:19 -0400
c04070
Subject: [PATCH 2/2] BZ1518320 - entry cache crash fix
c04070
c04070
Description: Fix cherry-pick error
c04070
---
c04070
 ldap/servers/slapd/time.c | 26 --------------------------
c04070
 1 file changed, 26 deletions(-)
c04070
c04070
diff --git a/ldap/servers/slapd/time.c b/ldap/servers/slapd/time.c
c04070
index 2a3865858..584bd1e63 100644
c04070
--- a/ldap/servers/slapd/time.c
c04070
+++ b/ldap/servers/slapd/time.c
c04070
@@ -96,32 +96,6 @@ slapi_current_utc_time_hr(void)
c04070
     return ltnow;
c04070
 }
c04070
 
c04070
-struct timespec
c04070
-slapi_current_rel_time_hr(void)
c04070
-{
c04070
-    struct timespec now;
c04070
-    clock_gettime(CLOCK_MONOTONIC, &now);
c04070
-    return now;
c04070
-}
c04070
-
c04070
-void
c04070
-slapi_timespec_diff(struct timespec *a, struct timespec *b, struct timespec *diff)
c04070
-{
c04070
-    /* Now diff the two */
c04070
-    time_t sec = a->tv_sec - b->tv_sec;
c04070
-    int32_t nsec = a->tv_nsec - b->tv_nsec;
c04070
-
c04070
-    if (nsec < 0) {
c04070
-        /* It's negative so take one second */
c04070
-        sec -= 1;
c04070
-        /* And set nsec to to a whole value */
c04070
-        nsec = 1000000000 - nsec;
c04070
-    }
c04070
-
c04070
-    diff->tv_sec = sec;
c04070
-    diff->tv_nsec = nsec;
c04070
-}
c04070
-
c04070
 time_t
c04070
 slapi_current_utc_time(void)
c04070
 {
c04070
-- 
c04070
2.21.0
c04070