This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
+ the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "includes.h"
#include "libcli/composite/composite.h"
#include "winbind/wb_server.h"
#include "smbd/service_task.h"
-#include "librpc/gen_ndr/ndr_lsa.h"
#include "librpc/gen_ndr/ndr_lsa_c.h"
/* List trusted domains. To avoid the trouble with having to wait for other
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;
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)
struct composite_context *result, *ctx;
struct cmd_list_trustdom_state *state;
- result = talloc_zero(mem_ctx, struct composite_context);
+ result = composite_create(mem_ctx, service->task->event_ctx);
if (result == NULL) goto failed;
- result->state = COMPOSITE_STATE_IN_PROGRESS;
- result->async.fn = NULL;
- result->event_ctx = service->task->event_ctx;
state = talloc(result, struct cmd_list_trustdom_state);
if (state == NULL) goto failed;
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->lsa_pipe->conn);
- if (composite_nomem(tree, state->ctx)) return;
-
- ctx = wb_init_lsa_send(state, tree, domain->lsa_auth_type,
- domain->schannel_creds);
+ ctx = wb_init_lsa_send(state, domain);
composite_continue(state->ctx, ctx, cmd_list_trustdoms_recv_lsa,
state);
}
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,
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,
- 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;
state->domains = talloc_realloc(state, state->domains,
struct wb_dom_info *,
state->num_domains);
- if (composite_nomem(state->domains, state->ctx)) return;
+ if (state->num_domains &&
+ 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;
state->r.out.domains->domains[i].sid);
}
- if (NT_STATUS_IS_OK(state->ctx->status)) {
+ if (NT_STATUS_IS_OK(state->ctx->status) || NT_STATUS_EQUAL(state->ctx->status, NT_STATUS_NO_MORE_ENTRIES)) {
+ state->ctx->status = NT_STATUS_OK;
composite_done(state->ctx);
return;
}
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);
git.samba.org / samba.git / blobdiff