s4-winbindd: Do not ask for a tree that we will not use

[samba.git] / source4 / winbind / wb_cmd_list_trustdom.c

diff --git a/source4/winbind/wb_cmd_list_trustdom.c b/source4/winbind/wb_cmd_list_trustdom.c
index fe98ce2f6a1a9dd637ea9d9703c8764358975fee..899de61c078076ab5dd486b6816f274b3136c961 100644 (file)
--- a/source4/winbind/wb_cmd_list_trustdom.c
+++ b/source4/winbind/wb_cmd_list_trustdom.c
@@ -33,7 +33,7 @@ struct cmd_list_trustdom_state {
        struct composite_context *ctx;
        struct dcerpc_pipe *lsa_pipe;
        struct policy_handle *lsa_policy;
-       int num_domains;
+       uint32_t num_domains;
        struct wb_dom_info **domains;
 
        uint32_t resume_handle;
@@ -43,7 +43,7 @@ struct cmd_list_trustdom_state {
 
 static void cmd_list_trustdoms_recv_domain(struct composite_context *ctx);
 static void cmd_list_trustdoms_recv_lsa(struct composite_context *ctx);
-static void cmd_list_trustdoms_recv_doms(struct rpc_request *req);
+static void cmd_list_trustdoms_recv_doms(struct tevent_req *subreq);
 
 struct composite_context *wb_cmd_list_trustdoms_send(TALLOC_CTX *mem_ctx,
                                                     struct wbsrv_service *service)
@@ -76,14 +76,10 @@ static void cmd_list_trustdoms_recv_domain(struct composite_context *ctx)
                talloc_get_type(ctx->async.private_data,
                                struct cmd_list_trustdom_state);
        struct wbsrv_domain *domain;
-       struct smbcli_tree *tree;
 
        state->ctx->status = wb_sid2domain_recv(ctx, &domain);
        if (!composite_is_ok(state->ctx)) return;
 
-       tree = dcerpc_smb_tree(domain->libnet_ctx->lsa.pipe->conn);
-       if (composite_nomem(tree, state->ctx)) return;
-
        ctx = wb_init_lsa_send(state, domain);
        composite_continue(state->ctx, ctx, cmd_list_trustdoms_recv_lsa,
                           state);
@@ -94,7 +90,7 @@ static void cmd_list_trustdoms_recv_lsa(struct composite_context *ctx)
        struct cmd_list_trustdom_state *state =
                talloc_get_type(ctx->async.private_data,
                                struct cmd_list_trustdom_state);
-       struct rpc_request *req;
+       struct tevent_req *subreq;
 
        state->ctx->status = wb_init_lsa_recv(ctx, state,
                                              &state->lsa_pipe,
@@ -114,19 +110,23 @@ static void cmd_list_trustdoms_recv_lsa(struct composite_context *ctx)
        state->r.out.resume_handle = &state->resume_handle;
        state->r.out.domains = &state->domainlist;
 
-       req = dcerpc_lsa_EnumTrustDom_send(state->lsa_pipe, state, &state->r);
-       composite_continue_rpc(state->ctx, req, cmd_list_trustdoms_recv_doms,
-                              state);
+       subreq = dcerpc_lsa_EnumTrustDom_r_send(state,
+                                               state->ctx->event_ctx,
+                                               state->lsa_pipe->binding_handle,
+                                               &state->r);
+       if (composite_nomem(subreq, state->ctx)) return;
+       tevent_req_set_callback(subreq, cmd_list_trustdoms_recv_doms, state);
 }
 
-static void cmd_list_trustdoms_recv_doms(struct rpc_request *req)
+static void cmd_list_trustdoms_recv_doms(struct tevent_req *subreq)
 {
        struct cmd_list_trustdom_state *state =
-               talloc_get_type(req->async.private_data,
-                               struct cmd_list_trustdom_state);
-       int i, old_num_domains;
+               tevent_req_callback_data(subreq,
+               struct cmd_list_trustdom_state);
+       uint32_t i, old_num_domains;
 
-       state->ctx->status = dcerpc_ndr_request_recv(req);
+       state->ctx->status = dcerpc_lsa_EnumTrustDom_r_recv(subreq, state);
+       TALLOC_FREE(subreq);
        if (!composite_is_ok(state->ctx)) return;
        state->ctx->status = state->r.out.result;
 
@@ -147,7 +147,7 @@ static void cmd_list_trustdoms_recv_doms(struct rpc_request *req)
            composite_nomem(state->domains, state->ctx)) return;
 
        for (i=0; i<state->r.out.domains->count; i++) {
-               int j = i+old_num_domains;
+               uint32_t j = i+old_num_domains;
                state->domains[j] = talloc(state->domains,
                                           struct wb_dom_info);
                if (composite_nomem(state->domains[i], state->ctx)) return;
@@ -173,14 +173,17 @@ static void cmd_list_trustdoms_recv_doms(struct rpc_request *req)
        state->r.out.resume_handle = &state->resume_handle;
        state->r.out.domains = &state->domainlist;
        
-       req = dcerpc_lsa_EnumTrustDom_send(state->lsa_pipe, state, &state->r);
-       composite_continue_rpc(state->ctx, req, cmd_list_trustdoms_recv_doms,
-                              state);
+       subreq = dcerpc_lsa_EnumTrustDom_r_send(state,
+                                               state->ctx->event_ctx,
+                                               state->lsa_pipe->binding_handle,
+                                               &state->r);
+       if (composite_nomem(subreq, state->ctx)) return;
+       tevent_req_set_callback(subreq, cmd_list_trustdoms_recv_doms, state);
 }
 
 NTSTATUS wb_cmd_list_trustdoms_recv(struct composite_context *ctx,
                                    TALLOC_CTX *mem_ctx,
-                                   int *num_domains,
+                                   uint32_t *num_domains,
                                    struct wb_dom_info ***domains)
 {
        NTSTATUS status = composite_wait(ctx);