68 lines
2.4 KiB
Diff
68 lines
2.4 KiB
Diff
|
From 5fe1e8ba91a1e2e95aadf94ecc5148bec804aa5a Mon Sep 17 00:00:00 2001
|
||
|
|
From: =?UTF-8?q?Petr=20=C4=8Cech?= <pcech@redhat.com>
|
||
|
|
Date: Thu, 23 Mar 2017 09:17:55 +0100
|
||
|
|
Subject: [PATCH 38/93] IFP: Filter with * in infopipe group methods
|
||
|
|
MIME-Version: 1.0
|
||
|
|
Content-Type: text/plain; charset=UTF-8
|
||
|
|
Content-Transfer-Encoding: 8bit
|
||
|
|
|
||
|
|
This patch fixes asterisk in filter of the ListByName Groups' method,
|
||
|
|
which ends up calling ifp_groups_list_copy() with a NULL pointer.
|
||
|
|
|
||
|
|
Resolves:
|
||
|
|
https://pagure.io/SSSD/sssd/issue/3305
|
||
|
|
|
||
|
|
Reviewed-by: Fabiano Fidêncio <fidencio@redhat.com>
|
||
|
|
Reviewed-by: Pavel Březina <pbrezina@redhat.com>
|
||
|
|
---
|
||
|
|
src/responder/ifp/ifp_groups.c | 26 +++++++++++++++-----------
|
||
|
|
1 file changed, 15 insertions(+), 11 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/src/responder/ifp/ifp_groups.c b/src/responder/ifp/ifp_groups.c
|
||
|
|
index f03c3e4b3720068db4c8266d65ea03a82a7beb62..def241f27241f415b91463dc214fa7791c2a6462 100644
|
||
|
|
--- a/src/responder/ifp/ifp_groups.c
|
||
|
|
+++ b/src/responder/ifp/ifp_groups.c
|
||
|
|
@@ -307,12 +307,14 @@ static void ifp_groups_list_by_name_done(struct tevent_req *req)
|
||
|
|
return;
|
||
|
|
}
|
||
|
|
|
||
|
|
- ret = ifp_groups_list_copy(list_ctx, result->ldb_result);
|
||
|
|
- if (ret != EOK) {
|
||
|
|
- error = sbus_error_new(sbus_req, SBUS_ERROR_INTERNAL,
|
||
|
|
- "Failed to copy domain result");
|
||
|
|
- sbus_request_fail_and_finish(sbus_req, error);
|
||
|
|
- return;
|
||
|
|
+ if (ret == EOK) {
|
||
|
|
+ ret = ifp_groups_list_copy(list_ctx, result->ldb_result);
|
||
|
|
+ if (ret != EOK) {
|
||
|
|
+ error = sbus_error_new(sbus_req, SBUS_ERROR_INTERNAL,
|
||
|
|
+ "Failed to copy domain result");
|
||
|
|
+ sbus_request_fail_and_finish(sbus_req, error);
|
||
|
|
+ return;
|
||
|
|
+ }
|
||
|
|
}
|
||
|
|
|
||
|
|
list_ctx->dom = get_next_domain(list_ctx->dom, SSS_GND_DESCEND);
|
||
|
|
@@ -394,11 +396,13 @@ static void ifp_groups_list_by_domain_and_name_done(struct tevent_req *req)
|
||
|
|
goto done;
|
||
|
|
}
|
||
|
|
|
||
|
|
- ret = ifp_groups_list_copy(list_ctx, result->ldb_result);
|
||
|
|
- if (ret != EOK) {
|
||
|
|
- error = sbus_error_new(sbus_req, SBUS_ERROR_INTERNAL,
|
||
|
|
- "Failed to copy domain result");
|
||
|
|
- goto done;
|
||
|
|
+ if (ret == EOK) {
|
||
|
|
+ ret = ifp_groups_list_copy(list_ctx, result->ldb_result);
|
||
|
|
+ if (ret != EOK) {
|
||
|
|
+ error = sbus_error_new(sbus_req, SBUS_ERROR_INTERNAL,
|
||
|
|
+ "Failed to copy domain result");
|
||
|
|
+ goto done;
|
||
|
|
+ }
|
||
|
|
}
|
||
|
|
|
||
|
|
done:
|
||
|
|
--
|
||
|
|
2.14.1
|
||
|
|
|