diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2007-12-04 01:51:36 +0100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2007-12-21 05:48:03 +0100 |
| commit | 9ebcd7a0df117158f1817b7d3a9a21ad4e1fa97a (patch) | |
| tree | b42e57b02397f6ae230282cc76161f502f9e8b2b /source4/librpc/rpc | |
| parent | 71ae20df2c7e346c4b115bbed7c579c881369fdb (diff) | |
| download | samba-9ebcd7a0df117158f1817b7d3a9a21ad4e1fa97a.tar.gz samba-9ebcd7a0df117158f1817b7d3a9a21ad4e1fa97a.tar.bz2 samba-9ebcd7a0df117158f1817b7d3a9a21ad4e1fa97a.zip | |
r26277: Move loadparm context higher up the stack.
(This used to be commit 38fa08310ce573e9b46e76c840ddda6f18863573)
Diffstat (limited to 'source4/librpc/rpc')
| -rw-r--r-- | source4/librpc/rpc/dcerpc.h | 1 | ||||
| -rw-r--r-- | source4/librpc/rpc/dcerpc_connect.c | 8 |
2 files changed, 6 insertions, 3 deletions
diff --git a/source4/librpc/rpc/dcerpc.h b/source4/librpc/rpc/dcerpc.h index b53f786618..ff827e50f2 100644 --- a/source4/librpc/rpc/dcerpc.h +++ b/source4/librpc/rpc/dcerpc.h @@ -177,6 +177,7 @@ struct dcerpc_pipe_connect { const char *pipe_name; const struct ndr_interface_table *interface; struct cli_credentials *creds; + const char **name_resolve_order; }; diff --git a/source4/librpc/rpc/dcerpc_connect.c b/source4/librpc/rpc/dcerpc_connect.c index 6c6441790b..4870b8d54a 100644 --- a/source4/librpc/rpc/dcerpc_connect.c +++ b/source4/librpc/rpc/dcerpc_connect.c @@ -205,8 +205,9 @@ static void continue_smb2_connect(struct composite_context *ctx) Initiate async open of a rpc connection request on SMB2 using the binding structure to determine the endpoint and options */ -static struct composite_context *dcerpc_pipe_connect_ncacn_np_smb2_send(TALLOC_CTX *mem_ctx, - struct dcerpc_pipe_connect *io) +static struct composite_context *dcerpc_pipe_connect_ncacn_np_smb2_send( + TALLOC_CTX *mem_ctx, + struct dcerpc_pipe_connect *io) { struct composite_context *c; struct pipe_np_smb2_state *s; @@ -235,7 +236,7 @@ static struct composite_context *dcerpc_pipe_connect_ncacn_np_smb2_send(TALLOC_C /* send smb2 connect request */ conn_req = smb2_connect_send(mem_ctx, s->io.binding->host, "IPC$", - lp_name_resolve_order(global_loadparm), + s->io.name_resolve_order, s->io.creds, c->event_ctx); composite_continue(c, conn_req, continue_smb2_connect, c); @@ -518,6 +519,7 @@ static void continue_connect(struct composite_context *c, struct pipe_connect_st pc.binding = s->binding; pc.interface = s->table; pc.creds = s->credentials; + pc.name_resolve_order = lp_name_resolve_order(global_loadparm); /* connect dcerpc pipe depending on required transport */ switch (s->binding->transport) { |