diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2007-12-06 16:54:34 +0100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2007-12-21 05:48:25 +0100 |
| commit | 6fd0d9d3b75546d08c24c513e05b1843d5777608 (patch) | |
| tree | 5ea3eb851dc089f125e86db959b23b59f53377fb /source/librpc/rpc | |
| parent | 49be7e43ff52a75cb9b4b9e2c3d4c339dbd69416 (diff) | |
| download | samba-6fd0d9d3b75546d08c24c513e05b1843d5777608.tar.gz | |
r26313: Fix more uses of static loadparm.
Diffstat (limited to 'source/librpc/rpc')
| -rw-r--r-- | source/librpc/rpc/dcerpc_connect.c | 3 | ||||
| -rw-r--r-- | source/librpc/rpc/dcerpc_secondary.c | 3 | ||||
| -rw-r--r-- | source/librpc/rpc/dcerpc_sock.c | 7 |
3 files changed, 8 insertions, 5 deletions
diff --git a/source/librpc/rpc/dcerpc_connect.c b/source/librpc/rpc/dcerpc_connect.c index 4870b8d54ab..b9913106f0b 100644 --- a/source/librpc/rpc/dcerpc_connect.c +++ b/source/librpc/rpc/dcerpc_connect.c @@ -444,7 +444,8 @@ static struct composite_context* dcerpc_pipe_connect_ncalrpc_send(TALLOC_CTX *me s->io = *io; /* send pipe open request */ - pipe_req = dcerpc_pipe_open_pipe_send(s->io.pipe->conn, s->io.binding->endpoint); + pipe_req = dcerpc_pipe_open_pipe_send(s->io.pipe->conn, lp_ncalrpc_dir(global_loadparm), + s->io.binding->endpoint); composite_continue(c, pipe_req, continue_pipe_open_ncalrpc, c); return c; } diff --git a/source/librpc/rpc/dcerpc_secondary.c b/source/librpc/rpc/dcerpc_secondary.c index 2e6311adbda..4d3547b60c6 100644 --- a/source/librpc/rpc/dcerpc_secondary.c +++ b/source/librpc/rpc/dcerpc_secondary.c @@ -28,6 +28,7 @@ #include "lib/events/events.h" #include "librpc/rpc/dcerpc.h" #include "auth/credentials/credentials.h" +#include "param/param.h" struct sec_conn_state { @@ -96,7 +97,7 @@ struct composite_context* dcerpc_secondary_connection_send(struct dcerpc_pipe *p return c; case NCALRPC: - pipe_ncalrpc_req = dcerpc_pipe_open_pipe_send(s->pipe2->conn, + pipe_ncalrpc_req = dcerpc_pipe_open_pipe_send(s->pipe2->conn, lp_ncalrpc_dir(global_loadparm), s->binding->endpoint); composite_continue(c, pipe_ncalrpc_req, continue_open_pipe, c); return c; diff --git a/source/librpc/rpc/dcerpc_sock.c b/source/librpc/rpc/dcerpc_sock.c index f7ae377e7b3..530885f59c2 100644 --- a/source/librpc/rpc/dcerpc_sock.c +++ b/source/librpc/rpc/dcerpc_sock.c @@ -597,6 +597,7 @@ static void continue_np_open_socket(struct composite_context *ctx) Send pipe open request on ncalrpc */ struct composite_context* dcerpc_pipe_open_pipe_send(struct dcerpc_connection *conn, + const char *ncalrpc_dir, const char *identifier) { char *canon = NULL; @@ -619,7 +620,7 @@ struct composite_context* dcerpc_pipe_open_pipe_send(struct dcerpc_connection *c s->conn = conn; string_replace(canon, '/', '\\'); - s->full_path = talloc_asprintf(canon, "%s/%s", lp_ncalrpc_dir(global_loadparm), canon); + s->full_path = talloc_asprintf(canon, "%s/%s", ncalrpc_dir, canon); if (composite_nomem(s->full_path, c)) return c; /* prepare server address using path and transport name */ @@ -648,8 +649,8 @@ NTSTATUS dcerpc_pipe_open_pipe_recv(struct composite_context *c) /* Open a rpc pipe on a named pipe - sync version */ -NTSTATUS dcerpc_pipe_open_pipe(struct dcerpc_connection *conn, const char *identifier) +NTSTATUS dcerpc_pipe_open_pipe(struct dcerpc_connection *conn, const char *ncalrpc_dir, const char *identifier) { - struct composite_context *c = dcerpc_pipe_open_pipe_send(conn, identifier); + struct composite_context *c = dcerpc_pipe_open_pipe_send(conn, ncalrpc_dir, identifier); return dcerpc_pipe_open_pipe_recv(c); } |