diff options
| author | Stefan Metzmacher <metze@samba.org> | 2014-02-13 09:42:10 +0100 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2014-03-28 10:34:51 +0100 |
| commit | 0dd648a54ed00bfeb7c6074d16173128acd3799e (patch) | |
| tree | 73bedc22e9684b838e613caace45715b31f12b21 /source4/librpc/rpc/dcerpc_connect.c | |
| parent | d29c143fae4b67c9680a0b9773db3461f2d0d2b7 (diff) | |
| download | samba-0dd648a54ed00bfeb7c6074d16173128acd3799e.tar.gz samba-0dd648a54ed00bfeb7c6074d16173128acd3799e.tar.xz samba-0dd648a54ed00bfeb7c6074d16173128acd3799e.zip | |
s4:librpc/rpc: remember "ncalrpc_dir" on the dcerpc_pipe->binding
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Autobuild-User(master): Andrew Bartlett <abartlet@samba.org>
Autobuild-Date(master): Fri Mar 28 10:34:51 CET 2014 on sn-devel-104
Diffstat (limited to 'source4/librpc/rpc/dcerpc_connect.c')
| -rw-r--r-- | source4/librpc/rpc/dcerpc_connect.c | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/source4/librpc/rpc/dcerpc_connect.c b/source4/librpc/rpc/dcerpc_connect.c index 6c503ad95f..da452e682d 100644 --- a/source4/librpc/rpc/dcerpc_connect.c +++ b/source4/librpc/rpc/dcerpc_connect.c @@ -43,6 +43,9 @@ struct dcerpc_pipe_connect { const struct ndr_interface_table *interface; struct cli_credentials *creds; struct resolve_context *resolve_ctx; + struct { + const char *dir; + } ncalrpc; }; struct pipe_np_smb_state { @@ -505,7 +508,7 @@ static void continue_pipe_open_ncalrpc(struct composite_context *ctx) the binding structure to determine the endpoint and options */ static struct composite_context* dcerpc_pipe_connect_ncalrpc_send(TALLOC_CTX *mem_ctx, - struct dcerpc_pipe_connect *io, struct loadparm_context *lp_ctx) + struct dcerpc_pipe_connect *io) { struct composite_context *c; struct pipe_ncalrpc_state *s; @@ -531,7 +534,7 @@ static struct composite_context* dcerpc_pipe_connect_ncalrpc_send(TALLOC_CTX *me /* send pipe open request */ pipe_req = dcerpc_pipe_open_pipe_send(s->io.conn, - lpcfg_ncalrpc_dir(lp_ctx), + s->io.ncalrpc.dir, endpoint); composite_continue(c, pipe_req, continue_pipe_open_ncalrpc, c); return c; @@ -608,6 +611,7 @@ static void continue_connect(struct composite_context *c, struct pipe_connect_st uint32_t flags; /* dcerpc pipe connect input parameters */ + ZERO_STRUCT(pc); pc.conn = s->pipe->conn; pc.binding = s->binding; pc.pipe_name = NULL; @@ -646,7 +650,11 @@ static void continue_connect(struct composite_context *c, struct pipe_connect_st return; case NCALRPC: - ncalrpc_req = dcerpc_pipe_connect_ncalrpc_send(c, &pc, s->lp_ctx); + pc.ncalrpc.dir = lpcfg_ncalrpc_dir(s->lp_ctx); + c->status = dcerpc_binding_set_string_option(s->binding, "ncalrpc_dir", + pc.ncalrpc.dir); + if (!composite_is_ok(c)) return; + ncalrpc_req = dcerpc_pipe_connect_ncalrpc_send(c, &pc); composite_continue(c, ncalrpc_req, continue_pipe_connect_ncalrpc, c); return; |