From 041c699f3ae10d189405b93977e3143813fb4525 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Mon, 13 Sep 2010 16:37:10 +1000 Subject: s4-libnet: converted finddcs call to tevent_req Pair-Programmed-With: Andrew Bartlett --- source4/libnet/libnet_lookup.c | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) (limited to 'source4/libnet/libnet_lookup.c') diff --git a/source4/libnet/libnet_lookup.c b/source4/libnet/libnet_lookup.c index 43a7654d4b8..36c747b9517 100644 --- a/source4/libnet/libnet_lookup.c +++ b/source4/libnet/libnet_lookup.c @@ -186,21 +186,21 @@ NTSTATUS libnet_LookupHost(struct libnet_context *ctx, TALLOC_CTX *mem_ctx, /** * Sends asynchronous LookupDCs request */ -struct composite_context* libnet_LookupDCs_send(struct libnet_context *ctx, - TALLOC_CTX *mem_ctx, - struct libnet_LookupDCs *io) +struct tevent_req *libnet_LookupDCs_send(struct libnet_context *ctx, + TALLOC_CTX *mem_ctx, + struct libnet_LookupDCs *io) { - struct composite_context *c; + struct tevent_req *req; struct messaging_context *msg_ctx = messaging_client_init(mem_ctx, - lpcfg_messaging_path(mem_ctx, ctx->lp_ctx), - ctx->event_ctx); - - c = finddcs_send(mem_ctx, lpcfg_netbios_name(ctx->lp_ctx), - lpcfg_nbt_port(ctx->lp_ctx), io->in.domain_name, - io->in.name_type, NULL, ctx->resolve_ctx, - ctx->event_ctx, msg_ctx); - return c; + lpcfg_messaging_path(mem_ctx, ctx->lp_ctx), + ctx->event_ctx); + + req = finddcs_send(mem_ctx, lpcfg_netbios_name(ctx->lp_ctx), + lpcfg_nbt_port(ctx->lp_ctx), io->in.domain_name, + io->in.name_type, NULL, ctx->resolve_ctx, + ctx->event_ctx, msg_ctx); + return req; } /** @@ -212,12 +212,12 @@ struct composite_context* libnet_LookupDCs_send(struct libnet_context *ctx, * @return nt status code of execution */ -NTSTATUS libnet_LookupDCs_recv(struct composite_context *c, TALLOC_CTX *mem_ctx, +NTSTATUS libnet_LookupDCs_recv(struct tevent_req *req, TALLOC_CTX *mem_ctx, struct libnet_LookupDCs *io) { NTSTATUS status; - status = finddcs_recv(c, mem_ctx, &io->out.num_dcs, &io->out.dcs); - /* "c" already freed here */ + status = finddcs_recv(req, mem_ctx, &io->out.num_dcs, &io->out.dcs); + /* "req" already freed here */ return status; } @@ -228,8 +228,8 @@ NTSTATUS libnet_LookupDCs_recv(struct composite_context *c, TALLOC_CTX *mem_ctx, NTSTATUS libnet_LookupDCs(struct libnet_context *ctx, TALLOC_CTX *mem_ctx, struct libnet_LookupDCs *io) { - struct composite_context *c = libnet_LookupDCs_send(ctx, mem_ctx, io); - return libnet_LookupDCs_recv(c, mem_ctx, io); + struct tevent_req *req = libnet_LookupDCs_send(ctx, mem_ctx, io); + return libnet_LookupDCs_recv(req, mem_ctx, io); } -- cgit v1.2.1