summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2010-08-08 09:11:45 +0200
committerVolker Lendecke <vl@samba.org>2010-08-08 16:03:15 +0200
commit33256d6478381af3bee9ef064566e69cb4943c39 (patch)
tree1ced64625ef6cd6898b1c744c55de1d3ad896dc6
parent7c90a6bf38829dc6be026b65b29b81db9fbbdf0d (diff)
downloadsamba-33256d6478381af3bee9ef064566e69cb4943c39.tar.gz
samba-33256d6478381af3bee9ef064566e69cb4943c39.tar.bz2
samba-33256d6478381af3bee9ef064566e69cb4943c39.zip
s3: Lift the smbd_messaging_context from np_open
-rw-r--r--source3/include/proto.h1
-rw-r--r--source3/rpc_server/srv_pipe_hnd.c4
-rw-r--r--source3/smbd/pipes.c4
3 files changed, 6 insertions, 3 deletions
diff --git a/source3/include/proto.h b/source3/include/proto.h
index ed723436e1..c0d9963183 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -4720,6 +4720,7 @@ NTSTATUS np_open(TALLOC_CTX *mem_ctx, const char *name,
const struct tsocket_address *local_address,
const struct tsocket_address *remote_address,
struct auth_serversupplied_info *server_info,
+ struct messaging_context *msg_ctx,
struct fake_file_handle **phandle);
bool np_read_in_progress(struct fake_file_handle *handle);
struct tevent_req *np_write_send(TALLOC_CTX *mem_ctx, struct event_context *ev,
diff --git a/source3/rpc_server/srv_pipe_hnd.c b/source3/rpc_server/srv_pipe_hnd.c
index c96d705f76..ea04164f13 100644
--- a/source3/rpc_server/srv_pipe_hnd.c
+++ b/source3/rpc_server/srv_pipe_hnd.c
@@ -537,6 +537,7 @@ NTSTATUS np_open(TALLOC_CTX *mem_ctx, const char *name,
const struct tsocket_address *local_address,
const struct tsocket_address *remote_address,
struct auth_serversupplied_info *server_info,
+ struct messaging_context *msg_ctx,
struct fake_file_handle **phandle)
{
const char **proxy_list;
@@ -582,8 +583,7 @@ NTSTATUS np_open(TALLOC_CTX *mem_ctx, const char *name,
}
p = make_internal_rpc_pipe_p(handle, &syntax, client_address,
- server_info,
- smbd_messaging_context());
+ server_info, msg_ctx);
handle->type = FAKE_FILE_TYPE_NAMED_PIPE;
handle->private_data = p;
diff --git a/source3/smbd/pipes.c b/source3/smbd/pipes.c
index 17d2678e35..d321c7a73d 100644
--- a/source3/smbd/pipes.c
+++ b/source3/smbd/pipes.c
@@ -69,7 +69,9 @@ NTSTATUS open_np_file(struct smb_request *smb_req, const char *name,
status = np_open(fsp, name,
conn->sconn->local_address,
conn->sconn->remote_address,
- conn->server_info, &fsp->fake_file_handle);
+ conn->server_info,
+ conn->sconn->msg_ctx,
+ &fsp->fake_file_handle);
if (!NT_STATUS_IS_OK(status)) {
DEBUG(10, ("np_open(%s) returned %s\n", name,
nt_errstr(status)));