From e7a100200bf19655f7ebc100ff13ba6d4adfca78 Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Mon, 12 Dec 2011 13:47:56 +0100
Subject: s3:smbd/pipes: avoid passing server_event_context() as event context
 to np_{read,write}_send

metze
---
 source3/smbd/ipc.c        | 4 ++--
 source3/smbd/pipes.c      | 6 +++---
 source3/smbd/smb2_read.c  | 2 +-
 source3/smbd/smb2_write.c | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'source3/smbd')

diff --git a/source3/smbd/ipc.c b/source3/smbd/ipc.c
index 84cf1c54f7..36c29164f0 100644
--- a/source3/smbd/ipc.c
+++ b/source3/smbd/ipc.c
@@ -268,7 +268,7 @@ static void api_dcerpc_cmd(connection_struct *conn, struct smb_request *req,
 	state->num_data = length;
 	state->max_read = max_read;
 
-	subreq = np_write_send(state, server_event_context(), state->handle,
+	subreq = np_write_send(state, req->sconn->ev_ctx, state->handle,
 			       state->data, length);
 	if (subreq == NULL) {
 		TALLOC_FREE(state);
@@ -305,7 +305,7 @@ static void api_dcerpc_cmd_write_done(struct tevent_req *subreq)
 		goto send;
 	}
 
-	subreq = np_read_send(state, server_event_context(),
+	subreq = np_read_send(state, req->sconn->ev_ctx,
 			      state->handle, state->data, state->max_read);
 	if (subreq == NULL) {
 		reply_nterror(req, NT_STATUS_NO_MEMORY);
diff --git a/source3/smbd/pipes.c b/source3/smbd/pipes.c
index 2ff3779b0e..b680087dd4 100644
--- a/source3/smbd/pipes.c
+++ b/source3/smbd/pipes.c
@@ -202,7 +202,7 @@ void reply_pipe_write(struct smb_request *req)
 	DEBUG(6, ("reply_pipe_write: %x name: %s len: %d\n", (int)fsp->fnum,
 		  fsp_str_dbg(fsp), (int)state->numtowrite));
 
-	subreq = np_write_send(state, server_event_context(),
+	subreq = np_write_send(state, req->sconn->ev_ctx,
 			       fsp->fake_file_handle, data, state->numtowrite);
 	if (subreq == NULL) {
 		TALLOC_FREE(state);
@@ -318,7 +318,7 @@ void reply_pipe_write_and_X(struct smb_request *req)
 		state->numtowrite -= 2;
 	}
 
-	subreq = np_write_send(state, server_event_context(),
+	subreq = np_write_send(state, req->sconn->ev_ctx,
 			       fsp->fake_file_handle, data, state->numtowrite);
 	if (subreq == NULL) {
 		TALLOC_FREE(state);
@@ -425,7 +425,7 @@ void reply_pipe_read_and_X(struct smb_request *req)
 	state->outbuf = req->outbuf;
 	req->outbuf = NULL;
 
-	subreq = np_read_send(state, server_event_context(),
+	subreq = np_read_send(state, req->sconn->ev_ctx,
 			      fsp->fake_file_handle, data,
 			      state->smb_maxcnt);
 	if (subreq == NULL) {
diff --git a/source3/smbd/smb2_read.c b/source3/smbd/smb2_read.c
index 08622092c6..24ec3e12fc 100644
--- a/source3/smbd/smb2_read.c
+++ b/source3/smbd/smb2_read.c
@@ -451,7 +451,7 @@ static struct tevent_req *smbd_smb2_read_send(TALLOC_CTX *mem_ctx,
 			return tevent_req_post(req, ev);
 		}
 
-		subreq = np_read_send(state, server_event_context(),
+		subreq = np_read_send(state, ev,
 				      fsp->fake_file_handle,
 				      state->out_data.data,
 				      state->out_data.length);
diff --git a/source3/smbd/smb2_write.c b/source3/smbd/smb2_write.c
index 14d384fff3..27113350c6 100644
--- a/source3/smbd/smb2_write.c
+++ b/source3/smbd/smb2_write.c
@@ -287,7 +287,7 @@ static struct tevent_req *smbd_smb2_write_send(TALLOC_CTX *mem_ctx,
 			return tevent_req_post(req, ev);
 		}
 
-		subreq = np_write_send(state, server_event_context(),
+		subreq = np_write_send(state, ev,
 				       fsp->fake_file_handle,
 				       in_data.data,
 				       in_data.length);
-- 
cgit