|
 |
ecf709 |
From a2bfa4d2074cacc5d30f17a3b3af260ec9eaaa59 Mon Sep 17 00:00:00 2001
|
|
|
ecf709 |
From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= <fidencio@redhat.com>
|
|
|
ecf709 |
Date: Thu, 27 Apr 2017 11:24:45 +0200
|
|
|
ecf709 |
Subject: [PATCH 125/127] CACHE_REQ_RESULT: Introduce
|
|
|
ecf709 |
cache_req_create_ldb_result_from_msg_list()
|
|
|
ecf709 |
MIME-Version: 1.0
|
|
|
ecf709 |
Content-Type: text/plain; charset=UTF-8
|
|
|
ecf709 |
Content-Transfer-Encoding: 8bit
|
|
|
ecf709 |
|
|
|
ecf709 |
Similarly to what cache_req_create_ldb_result_from_msg() does this new
|
|
|
ecf709 |
function creates a new ldb_result from a list of ldb_message.
|
|
|
ecf709 |
|
|
|
ecf709 |
It's going to be used in the follow-up patch where some messages from
|
|
|
ecf709 |
ldb_result may be filtered and then a new ldb_result has to be created.
|
|
|
ecf709 |
|
|
|
ecf709 |
Related:
|
|
|
ecf709 |
https://pagure.io/SSSD/sssd/issue/3362
|
|
|
ecf709 |
|
|
|
ecf709 |
Signed-off-by: Fabiano Fidêncio <fidencio@redhat.com>
|
|
|
ecf709 |
|
|
|
ecf709 |
Reviewed-by: Pavel Březina <pbrezina@redhat.com>
|
|
|
ecf709 |
(cherry picked from commit 180e0b282be6aeb047c4b24b46e0b56afba1fdc8)
|
|
|
ecf709 |
---
|
|
|
ecf709 |
src/responder/common/cache_req/cache_req_private.h | 5 ++++
|
|
|
ecf709 |
src/responder/common/cache_req/cache_req_result.c | 35 ++++++++++++++++++++++
|
|
|
ecf709 |
2 files changed, 40 insertions(+)
|
|
|
ecf709 |
|
|
|
ecf709 |
diff --git a/src/responder/common/cache_req/cache_req_private.h b/src/responder/common/cache_req/cache_req_private.h
|
|
|
ecf709 |
index 851005c389f994b1bd2d04cda9b68df8b18492cc..c0ee5f969f2a171b8a6eb396b3d14b593d157b76 100644
|
|
|
ecf709 |
--- a/src/responder/common/cache_req/cache_req_private.h
|
|
|
ecf709 |
+++ b/src/responder/common/cache_req/cache_req_private.h
|
|
|
ecf709 |
@@ -137,6 +137,11 @@ cache_req_create_and_add_result(TALLOC_CTX *mem_ctx,
|
|
|
ecf709 |
size_t *_num_results);
|
|
|
ecf709 |
|
|
|
ecf709 |
struct ldb_result *
|
|
|
ecf709 |
+cache_req_create_ldb_result_from_msg_list(TALLOC_CTX *mem_ctx,
|
|
|
ecf709 |
+ struct ldb_message **ldb_msgs,
|
|
|
ecf709 |
+ size_t ldb_msg_count);
|
|
|
ecf709 |
+
|
|
|
ecf709 |
+struct ldb_result *
|
|
|
ecf709 |
cache_req_create_ldb_result_from_msg(TALLOC_CTX *mem_ctx,
|
|
|
ecf709 |
struct ldb_message *ldb_msg);
|
|
|
ecf709 |
|
|
|
ecf709 |
diff --git a/src/responder/common/cache_req/cache_req_result.c b/src/responder/common/cache_req/cache_req_result.c
|
|
|
ecf709 |
index e20ae5653acf22a2e0190ef6a88836c7fab9868e..366ba748082336c7c752b576cfd7b8fb8cd82fcf 100644
|
|
|
ecf709 |
--- a/src/responder/common/cache_req/cache_req_result.c
|
|
|
ecf709 |
+++ b/src/responder/common/cache_req/cache_req_result.c
|
|
|
ecf709 |
@@ -122,6 +122,41 @@ cache_req_create_and_add_result(TALLOC_CTX *mem_ctx,
|
|
|
ecf709 |
}
|
|
|
ecf709 |
|
|
|
ecf709 |
struct ldb_result *
|
|
|
ecf709 |
+cache_req_create_ldb_result_from_msg_list(TALLOC_CTX *mem_ctx,
|
|
|
ecf709 |
+ struct ldb_message **ldb_msgs,
|
|
|
ecf709 |
+ size_t ldb_msg_count)
|
|
|
ecf709 |
+{
|
|
|
ecf709 |
+ struct ldb_result *ldb_result;
|
|
|
ecf709 |
+
|
|
|
ecf709 |
+ if (ldb_msgs == NULL || ldb_msgs[0] == NULL) {
|
|
|
ecf709 |
+ DEBUG(SSSDBG_CRIT_FAILURE, "No message set!\n");
|
|
|
ecf709 |
+ return NULL;
|
|
|
ecf709 |
+ }
|
|
|
ecf709 |
+
|
|
|
ecf709 |
+ ldb_result = talloc_zero(NULL, struct ldb_result);
|
|
|
ecf709 |
+ if (ldb_result == NULL) {
|
|
|
ecf709 |
+ return NULL;
|
|
|
ecf709 |
+ }
|
|
|
ecf709 |
+
|
|
|
ecf709 |
+ ldb_result->extended = NULL;
|
|
|
ecf709 |
+ ldb_result->controls = NULL;
|
|
|
ecf709 |
+ ldb_result->refs = NULL;
|
|
|
ecf709 |
+ ldb_result->count = ldb_msg_count;
|
|
|
ecf709 |
+ ldb_result->msgs = talloc_zero_array(ldb_result, struct ldb_message *,
|
|
|
ecf709 |
+ ldb_msg_count + 1);
|
|
|
ecf709 |
+ if (ldb_result->msgs == NULL) {
|
|
|
ecf709 |
+ talloc_free(ldb_result);
|
|
|
ecf709 |
+ return NULL;
|
|
|
ecf709 |
+ }
|
|
|
ecf709 |
+
|
|
|
ecf709 |
+ for (size_t i = 0; i < ldb_msg_count; i++) {
|
|
|
ecf709 |
+ ldb_result->msgs[i] = talloc_steal(ldb_result->msgs, ldb_msgs[i]);
|
|
|
ecf709 |
+ }
|
|
|
ecf709 |
+
|
|
|
ecf709 |
+ return ldb_result;
|
|
|
ecf709 |
+}
|
|
|
ecf709 |
+
|
|
|
ecf709 |
+struct ldb_result *
|
|
|
ecf709 |
cache_req_create_ldb_result_from_msg(TALLOC_CTX *mem_ctx,
|
|
|
ecf709 |
struct ldb_message *ldb_msg)
|
|
|
ecf709 |
{
|
|
|
ecf709 |
--
|
|
|
ecf709 |
2.9.3
|
|
|
ecf709 |
|