|
 |
9f89df |
From f0e6ed1942f1a4263a88a0c02d866d616448668f Mon Sep 17 00:00:00 2001
|
|
|
9f89df |
From: Sumit Bose <sbose@redhat.com>
|
|
|
9f89df |
Date: Tue, 18 Oct 2016 18:16:30 +0200
|
|
|
9f89df |
Subject: [PATCH 145/151] sdap: make some nested group related calls public
|
|
|
9f89df |
|
|
|
9f89df |
sdap_nested_groups_store() and rfc2307bis_nested_groups_send/recv() will
|
|
|
9f89df |
be reused for domain local group lookups.
|
|
|
9f89df |
|
|
|
9f89df |
Reviewed-by: Jakub Hrozek <jhrozek@redhat.com>
|
|
|
9f89df |
(cherry picked from commit 49d3f0a487d55571b2bdc9d3f8280b304b964b9d)
|
|
|
9f89df |
---
|
|
|
9f89df |
src/providers/ldap/sdap_async_initgroups.c | 12 ++----------
|
|
|
9f89df |
src/providers/ldap/sdap_async_private.h | 16 ++++++++++++++++
|
|
|
9f89df |
2 files changed, 18 insertions(+), 10 deletions(-)
|
|
|
9f89df |
|
|
|
9f89df |
diff --git a/src/providers/ldap/sdap_async_initgroups.c b/src/providers/ldap/sdap_async_initgroups.c
|
|
|
9f89df |
index 77324d0ee9eb2ad2fc35c2098d6c9c23a62747c9..f1ba65a98b07a593b0e3a722d0b2c56c8e4b821e 100644
|
|
|
9f89df |
--- a/src/providers/ldap/sdap_async_initgroups.c
|
|
|
9f89df |
+++ b/src/providers/ldap/sdap_async_initgroups.c
|
|
|
9f89df |
@@ -622,7 +622,7 @@ static int sdap_initgr_rfc2307_recv(struct tevent_req *req)
|
|
|
9f89df |
}
|
|
|
9f89df |
|
|
|
9f89df |
/* ==Common code for pure RFC2307bis and IPA/AD========================= */
|
|
|
9f89df |
-static errno_t
|
|
|
9f89df |
+errno_t
|
|
|
9f89df |
sdap_nested_groups_store(struct sysdb_ctx *sysdb,
|
|
|
9f89df |
struct sss_domain_info *domain,
|
|
|
9f89df |
struct sdap_options *opts,
|
|
|
9f89df |
@@ -1558,14 +1558,6 @@ static void sdap_initgr_rfc2307bis_process(struct tevent_req *subreq);
|
|
|
9f89df |
static void sdap_initgr_rfc2307bis_done(struct tevent_req *subreq);
|
|
|
9f89df |
errno_t save_rfc2307bis_user_memberships(
|
|
|
9f89df |
struct sdap_initgr_rfc2307bis_state *state);
|
|
|
9f89df |
-struct tevent_req *rfc2307bis_nested_groups_send(
|
|
|
9f89df |
- TALLOC_CTX *mem_ctx, struct tevent_context *ev,
|
|
|
9f89df |
- struct sdap_options *opts, struct sysdb_ctx *sysdb,
|
|
|
9f89df |
- struct sss_domain_info *dom, struct sdap_handle *sh,
|
|
|
9f89df |
- struct sdap_search_base **search_bases,
|
|
|
9f89df |
- struct sysdb_attrs **groups, size_t num_groups,
|
|
|
9f89df |
- hash_table_t *group_hash, size_t nesting);
|
|
|
9f89df |
-static errno_t rfc2307bis_nested_groups_recv(struct tevent_req *req);
|
|
|
9f89df |
|
|
|
9f89df |
static struct tevent_req *sdap_initgr_rfc2307bis_send(
|
|
|
9f89df |
TALLOC_CTX *memctx,
|
|
|
9f89df |
@@ -2616,7 +2608,7 @@ static void rfc2307bis_nested_groups_process(struct tevent_req *subreq)
|
|
|
9f89df |
tevent_req_set_callback(subreq, rfc2307bis_nested_groups_done, req);
|
|
|
9f89df |
}
|
|
|
9f89df |
|
|
|
9f89df |
-static errno_t rfc2307bis_nested_groups_recv(struct tevent_req *req)
|
|
|
9f89df |
+errno_t rfc2307bis_nested_groups_recv(struct tevent_req *req)
|
|
|
9f89df |
{
|
|
|
9f89df |
TEVENT_REQ_RETURN_ON_ERROR(req);
|
|
|
9f89df |
return EOK;
|
|
|
9f89df |
diff --git a/src/providers/ldap/sdap_async_private.h b/src/providers/ldap/sdap_async_private.h
|
|
|
9f89df |
index f09ddb71f48080251e61b8a850ccb8c9b5058331..4af4f7144d8855e4ed705f6a64e0a7818bc0b9a9 100644
|
|
|
9f89df |
--- a/src/providers/ldap/sdap_async_private.h
|
|
|
9f89df |
+++ b/src/providers/ldap/sdap_async_private.h
|
|
|
9f89df |
@@ -157,4 +157,20 @@ errno_t sdap_check_ad_group_type(struct sss_domain_info *dom,
|
|
|
9f89df |
struct sysdb_attrs *group_attrs,
|
|
|
9f89df |
const char *group_name,
|
|
|
9f89df |
bool *_need_filter);
|
|
|
9f89df |
+
|
|
|
9f89df |
+struct tevent_req *rfc2307bis_nested_groups_send(
|
|
|
9f89df |
+ TALLOC_CTX *mem_ctx, struct tevent_context *ev,
|
|
|
9f89df |
+ struct sdap_options *opts, struct sysdb_ctx *sysdb,
|
|
|
9f89df |
+ struct sss_domain_info *dom, struct sdap_handle *sh,
|
|
|
9f89df |
+ struct sdap_search_base **search_bases,
|
|
|
9f89df |
+ struct sysdb_attrs **groups, size_t num_groups,
|
|
|
9f89df |
+ hash_table_t *group_hash, size_t nesting);
|
|
|
9f89df |
+errno_t rfc2307bis_nested_groups_recv(struct tevent_req *req);
|
|
|
9f89df |
+
|
|
|
9f89df |
+errno_t sdap_nested_groups_store(struct sysdb_ctx *sysdb,
|
|
|
9f89df |
+ struct sss_domain_info *domain,
|
|
|
9f89df |
+ struct sdap_options *opts,
|
|
|
9f89df |
+ struct sysdb_attrs **groups,
|
|
|
9f89df |
+ unsigned long count);
|
|
|
9f89df |
+
|
|
|
9f89df |
#endif /* _SDAP_ASYNC_PRIVATE_H_ */
|
|
|
9f89df |
--
|
|
|
9f89df |
2.7.4
|
|
|
9f89df |
|