From e0502a6c5bc30415c372e9e6e835b94b04d5195a Mon Sep 17 00:00:00 2001 From: Jakub Hrozek Date: Tue, 10 Dec 2013 21:49:45 +0100 Subject: LDAP: Pass a private context to enumeration ptask instead of hardcoded connection Previously, the sdap-domain enumeration request used a single connection context to download all the data. Now we'd like to use different connections to download different objects, so the ID context is passed in and the request itself decides which connection to use for the sdap-domain enumeration. --- src/providers/ldap/ldap_common.h | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'src/providers/ldap/ldap_common.h') diff --git a/src/providers/ldap/ldap_common.h b/src/providers/ldap/ldap_common.h index b3bd950e1..889d5b118 100644 --- a/src/providers/ldap/ldap_common.h +++ b/src/providers/ldap/ldap_common.h @@ -95,11 +95,12 @@ void sdap_handle_account_info(struct be_req *breq, struct sdap_id_ctx *ctx, /* Set up enumeration and/or cleanup */ int ldap_id_setup_tasks(struct sdap_id_ctx *ctx); -int sdap_id_setup_tasks(struct sdap_id_ctx *ctx, - struct sdap_id_conn_ctx *conn, +int sdap_id_setup_tasks(struct be_ctx *be_ctx, + struct sdap_id_ctx *ctx, struct sdap_domain *sdom, be_ptask_send_t send_fn, - be_ptask_recv_t recv_fn); + be_ptask_recv_t recv_fn, + void *pvt); struct tevent_req * sdap_handle_acct_req_send(TALLOC_CTX *mem_ctx, @@ -177,16 +178,16 @@ int ldap_get_autofs_options(TALLOC_CTX *memctx, * structure that contains the request data */ struct ldap_enum_ctx { - struct sdap_id_ctx *ctx; struct sdap_domain *sdom; - struct sdap_id_conn_ctx *conn; + void *pvt; }; -errno_t ldap_setup_enumeration(struct sdap_id_ctx *ctx, - struct sdap_id_conn_ctx *conn, +errno_t ldap_setup_enumeration(struct be_ctx *be_ctx, + struct sdap_options *opts, struct sdap_domain *sdom, be_ptask_send_t send_fn, - be_ptask_recv_t recv_fn); + be_ptask_recv_t recv_fn, + void *pvt); struct tevent_req * ldap_enumeration_send(TALLOC_CTX *mem_ctx, struct tevent_context *ev, -- cgit