diff options
author | Jelmer Vernooij <jelmer@samba.org> | 2007-12-10 18:41:19 +0100 |
---|---|---|
committer | Stefan Metzmacher <metze@samba.org> | 2007-12-21 05:49:12 +0100 |
commit | 5f4842cf65ce64bfdf577cd549565da20ca818cf (patch) | |
tree | 65f9cb14c5910e70bc0fb64f45c7ffa5e382692f /source4/libnet/libnet_lookup.c | |
parent | eba25f5d1897fbe61e8d7c623fcacb647629bf07 (diff) | |
download | samba-5f4842cf65ce64bfdf577cd549565da20ca818cf.tar.gz samba-5f4842cf65ce64bfdf577cd549565da20ca818cf.tar.xz samba-5f4842cf65ce64bfdf577cd549565da20ca818cf.zip |
r26376: Add context for libcli_resolve.
(This used to be commit 459e1466a411d6f83b7372e248566e6e71c745fc)
Diffstat (limited to 'source4/libnet/libnet_lookup.c')
-rw-r--r-- | source4/libnet/libnet_lookup.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/source4/libnet/libnet_lookup.c b/source4/libnet/libnet_lookup.c index fcb24601e4..b8c6609d8e 100644 --- a/source4/libnet/libnet_lookup.c +++ b/source4/libnet/libnet_lookup.c @@ -57,7 +57,7 @@ struct composite_context *libnet_Lookup_send(struct libnet_context *ctx, struct composite_context *c; struct lookup_state *s; struct composite_context *cresolve_req; - const char** methods; + struct resolve_context *resolve_ctx; /* allocate context and state structures */ c = composite_create(ctx, ctx->event_ctx); @@ -81,14 +81,14 @@ struct composite_context *libnet_Lookup_send(struct libnet_context *ctx, s->hostname.scope = NULL; /* name resolution methods */ - if (io->in.methods) { - methods = io->in.methods; + if (io->in.resolve_ctx) { + resolve_ctx = io->in.resolve_ctx; } else { - methods = ctx->name_res_methods; + resolve_ctx = ctx->resolve_ctx; } /* send resolve request */ - cresolve_req = resolve_name_send(&s->hostname, c->event_ctx, methods); + cresolve_req = resolve_name_send(resolve_ctx, &s->hostname, c->event_ctx); if (composite_nomem(cresolve_req, c)) return c; composite_continue(c, cresolve_req, continue_name_resolved, c); @@ -196,7 +196,7 @@ struct composite_context* libnet_LookupDCs_send(struct libnet_context *ctx, c = finddcs_send(mem_ctx, lp_netbios_name(ctx->lp_ctx), io->in.domain_name, io->in.name_type, - NULL, ctx->name_res_methods, ctx->event_ctx, msg_ctx); + NULL, ctx->resolve_ctx, ctx->event_ctx, msg_ctx); return c; } |