From 77b4d7a26d92f9aa114d6e8d1073539afeb17fd8 Mon Sep 17 00:00:00 2001
From: Jakub Hrozek <jhrozek@redhat.com>
Date: Tue, 28 May 2019 14:56:15 +0200
Subject: [PATCH 46/64] BE: search with sysdb_search_with_ts_attr

Previously, the background refresh code had used sysdb_search_entry()
which does not run the search on the timestamp cache. Instead, this
patch changes to using sysdb_search_with_ts_attr with the
SYSDB_SEARCH_WITH_TS_ONLY_TS_FILTER optimization because currently only
the dataExpireTimestamp attribute is included in the filter.

Related:
https://pagure.io/SSSD/sssd/issue/4012

Reviewed-by: Sumit Bose <sbose@redhat.com>
(cherry picked from commit f27955297603dd7bcbab2569394853d5d9ca90ea)

Reviewed-by: Sumit Bose <sbose@redhat.com>
---
 src/providers/be_refresh.c | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/src/providers/be_refresh.c b/src/providers/be_refresh.c
index e8cf5da75..c6bb66b68 100644
--- a/src/providers/be_refresh.c
+++ b/src/providers/be_refresh.c
@@ -40,9 +40,8 @@ static errno_t be_refresh_get_values_ex(TALLOC_CTX *mem_ctx,
     const char *attrs[] = {attr, NULL};
     const char *filter = NULL;
     char **values = NULL;
-    struct ldb_message **msgs = NULL;
     struct sysdb_attrs **records = NULL;
-    size_t count;
+    struct ldb_result *res;
     time_t now = time(NULL);
     errno_t ret;
 
@@ -58,23 +57,23 @@ static errno_t be_refresh_get_values_ex(TALLOC_CTX *mem_ctx,
         goto done;
     }
 
-    ret = sysdb_search_entry(tmp_ctx, domain->sysdb, base_dn,
-                             LDB_SCOPE_SUBTREE, filter, attrs,
-                             &count, &msgs);
-    if (ret == ENOENT) {
-        count = 0;
-    } else if (ret != EOK) {
+    ret = sysdb_search_with_ts_attr(tmp_ctx, domain, base_dn,
+                                    LDB_SCOPE_SUBTREE,
+                                    SYSDB_SEARCH_WITH_TS_ONLY_TS_FILTER,
+                                    filter, attrs,
+                                    &res);
+    if (ret != EOK) {
         goto done;
     }
 
-    ret = sysdb_msg2attrs(tmp_ctx, count, msgs, &records);
+    ret = sysdb_msg2attrs(tmp_ctx, res->count, res->msgs, &records);
     if (ret != EOK) {
         DEBUG(SSSDBG_CRIT_FAILURE,
               "Could not convert ldb message to sysdb_attrs\n");
         goto done;
     }
 
-    ret = sysdb_attrs_to_list(tmp_ctx, records, count, attr, &values);
+    ret = sysdb_attrs_to_list(tmp_ctx, records, res->count, attr, &values);
     if (ret != EOK) {
         goto done;
     }
-- 
2.20.1