summaryrefslogtreecommitdiff
path: root/source4/librpc
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2007-12-07 13:30:31 +0100
committerStefan Metzmacher <metze@samba.org>2007-12-21 05:48:45 +0100
commit0b4fab2f6047f03221314f82229647d6662464e0 (patch)
tree4a0c1d4ca8ab861f4d861fa0b7a2fa7b30a9423c /source4/librpc
parent949f3c726452a59555236f9fdda52e79c3e5832b (diff)
downloadsamba-0b4fab2f6047f03221314f82229647d6662464e0.tar.gz
samba-0b4fab2f6047f03221314f82229647d6662464e0.tar.bz2
samba-0b4fab2f6047f03221314f82229647d6662464e0.zip
r26334: Avoid loadparm_context.
(This used to be commit 332dff80cc0f1dc80383f185409610cfb9f1d856)
Diffstat (limited to 'source4/librpc')
-rw-r--r--source4/librpc/rpc/dcerpc_connect.c2
-rw-r--r--source4/librpc/rpc/dcerpc_secondary.c3
-rw-r--r--source4/librpc/rpc/dcerpc_sock.c6
3 files changed, 6 insertions, 5 deletions
diff --git a/source4/librpc/rpc/dcerpc_connect.c b/source4/librpc/rpc/dcerpc_connect.c
index c39a944fdb..e6244fe229 100644
--- a/source4/librpc/rpc/dcerpc_connect.c
+++ b/source4/librpc/rpc/dcerpc_connect.c
@@ -308,7 +308,7 @@ static struct composite_context* dcerpc_pipe_connect_ncacn_ip_tcp_send(TALLOC_CT
/* send pipe open request on tcp/ip */
pipe_req = dcerpc_pipe_open_tcp_send(s->io.pipe->conn, s->host, s->target_hostname,
- s->port);
+ s->port, io->name_resolve_order);
composite_continue(c, pipe_req, continue_pipe_open_ncacn_ip_tcp, c);
return c;
}
diff --git a/source4/librpc/rpc/dcerpc_secondary.c b/source4/librpc/rpc/dcerpc_secondary.c
index 1c4de0a2f2..0aa38d55ed 100644
--- a/source4/librpc/rpc/dcerpc_secondary.c
+++ b/source4/librpc/rpc/dcerpc_secondary.c
@@ -92,7 +92,8 @@ struct composite_context* dcerpc_secondary_connection_send(struct dcerpc_pipe *p
pipe_tcp_req = dcerpc_pipe_open_tcp_send(s->pipe2->conn,
s->binding->host,
s->binding->target_hostname,
- atoi(s->binding->endpoint));
+ atoi(s->binding->endpoint),
+ lp_name_resolve_order(global_loadparm));
composite_continue(c, pipe_tcp_req, continue_open_tcp, c);
return c;
diff --git a/source4/librpc/rpc/dcerpc_sock.c b/source4/librpc/rpc/dcerpc_sock.c
index 530885f59c..8717a13467 100644
--- a/source4/librpc/rpc/dcerpc_sock.c
+++ b/source4/librpc/rpc/dcerpc_sock.c
@@ -452,7 +452,8 @@ static void continue_ipv4_open_socket(struct composite_context *ctx)
struct composite_context* dcerpc_pipe_open_tcp_send(struct dcerpc_connection *conn,
const char *server,
const char *target_hostname,
- uint32_t port)
+ uint32_t port,
+ const char **name_resolve_order)
{
struct composite_context *c;
struct pipe_tcp_state *s;
@@ -478,8 +479,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,
- lp_name_resolve_order(global_loadparm));
+ resolve_req = resolve_name_send(&name, c->event_ctx, name_resolve_order);
composite_continue(c, resolve_req, continue_ip_resolve_name, c);
return c;
}