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/librpc/rpc/dcerpc_sock.c | |
| parent | eba25f5d1897fbe61e8d7c623fcacb647629bf07 (diff) | |
| download | samba-5f4842cf65ce64bfdf577cd549565da20ca818cf.tar.gz samba-5f4842cf65ce64bfdf577cd549565da20ca818cf.tar.bz2 samba-5f4842cf65ce64bfdf577cd549565da20ca818cf.zip | |
r26376: Add context for libcli_resolve.
(This used to be commit 459e1466a411d6f83b7372e248566e6e71c745fc)
Diffstat (limited to 'source4/librpc/rpc/dcerpc_sock.c')
| -rw-r--r-- | source4/librpc/rpc/dcerpc_sock.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/source4/librpc/rpc/dcerpc_sock.c b/source4/librpc/rpc/dcerpc_sock.c index 327b1bf419..2e5a8388a1 100644 --- a/source4/librpc/rpc/dcerpc_sock.c +++ b/source4/librpc/rpc/dcerpc_sock.c @@ -332,7 +332,8 @@ static struct composite_context *dcerpc_pipe_open_socket_send(TALLOC_CTX *mem_ct talloc_steal(s->sock, s->socket_ctx); - conn_req = socket_connect_send(s->socket_ctx, NULL, s->server, 0, lp_name_resolve_order(global_loadparm), + conn_req = socket_connect_send(s->socket_ctx, NULL, s->server, 0, + lp_resolve_context(global_loadparm), c->event_ctx); composite_continue(c, conn_req, continue_socket_connect, c); return c; @@ -454,7 +455,7 @@ struct composite_context* dcerpc_pipe_open_tcp_send(struct dcerpc_connection *co const char *server, const char *target_hostname, uint32_t port, - const char **name_resolve_order) + struct resolve_context *resolve_ctx) { struct composite_context *c; struct pipe_tcp_state *s; @@ -480,7 +481,7 @@ struct composite_context* dcerpc_pipe_open_tcp_send(struct dcerpc_connection *co s->conn = conn; make_nbt_name_server(&name, server); - resolve_req = resolve_name_send(&name, c->event_ctx, name_resolve_order); + resolve_req = resolve_name_send(resolve_ctx, &name, c->event_ctx); composite_continue(c, resolve_req, continue_ip_resolve_name, c); return c; } |