sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-25 23:21:54 +03:00
Code

r26334: Avoid loadparm_context.

Browse Source
This commit is contained in:
Jelmer Vernooij 2007-12-07 13:30:31 +01:00 committed by Stefan Metzmacher
parent 0c91026e58
commit 332dff80cc
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/librpc/rpc/dcerpc_connect.c
View File

@ -308,7 +308,7 @@ static struct composite_context* dcerpc_pipe_connect_ncacn_ip_tcp_send(TALLOC_CT
/* send pipe open request on tcp/ip */ /* send pipe open request on tcp/ip */
pipe_req = dcerpc_pipe_open_tcp_send(s->io.pipe->conn, s->host, s->target_hostname, 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); composite_continue(c, pipe_req, continue_pipe_open_ncacn_ip_tcp, c);
return c; return c;
} }

3
source/librpc/rpc/dcerpc_secondary.c
View File

@ -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, pipe_tcp_req = dcerpc_pipe_open_tcp_send(s->pipe2->conn,
s->binding->host, s->binding->host,
s->binding->target_hostname, 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); composite_continue(c, pipe_tcp_req, continue_open_tcp, c);
return c; return c;

6
source/librpc/rpc/dcerpc_sock.c
View File

@ -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, struct composite_context* dcerpc_pipe_open_tcp_send(struct dcerpc_connection *conn,
const char *server, const char *server,
const char *target_hostname, const char *target_hostname,
uint32_t port) uint32_t port,
const char **name_resolve_order)
{ {
struct composite_context *c; struct composite_context *c;
struct pipe_tcp_state *s; struct pipe_tcp_state *s;
@ -478,8 +479,7 @@ struct composite_context* dcerpc_pipe_open_tcp_send(struct dcerpc_connection *co
s->conn = conn; s->conn = conn;
make_nbt_name_server(&name, server); make_nbt_name_server(&name, server);
resolve_req = resolve_name_send(&name, c->event_ctx, resolve_req = resolve_name_send(&name, c->event_ctx, name_resolve_order);
lp_name_resolve_order(global_loadparm));
composite_continue(c, resolve_req, continue_ip_resolve_name, c); composite_continue(c, resolve_req, continue_ip_resolve_name, c);
return c; return c;
} }