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 | 2f5ca872a80ad872ab864061f0c6982d8605393f (patch) | |
| tree | 061592e4ae1e79adc57cd5d99ff2fd6f3b8c2549 /source4/librpc/rpc/dcerpc_sock.c | |
| parent | fb29325f1d4feba6c3f52b690d3da5d492618c4f (diff) | |
| download | samba-2f5ca872a80ad872ab864061f0c6982d8605393f.tar.gz samba-2f5ca872a80ad872ab864061f0c6982d8605393f.tar.bz2 samba-2f5ca872a80ad872ab864061f0c6982d8605393f.zip | |
r26313: Fix more uses of static loadparm.
(This used to be commit 6fd0d9d3b75546d08c24c513e05b1843d5777608)
Diffstat (limited to 'source4/librpc/rpc/dcerpc_sock.c')
| -rw-r--r-- | source4/librpc/rpc/dcerpc_sock.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/source4/librpc/rpc/dcerpc_sock.c b/source4/librpc/rpc/dcerpc_sock.c index f7ae377e7b..530885f59c 100644 --- a/source4/librpc/rpc/dcerpc_sock.c +++ b/source4/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); } |