summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2011-12-12 13:47:56 +0100
committerStefan Metzmacher <metze@samba.org>2011-12-12 14:35:43 +0100
commite7a100200bf19655f7ebc100ff13ba6d4adfca78 (patch)
tree90ac81551f2e9b6ece4004632ebaf424557c7da0
parentbf8cce18c6dba9ed254a256ce3e8827e7f1e1827 (diff)
downloadsamba-e7a100200bf19655f7ebc100ff13ba6d4adfca78.tar.gz
samba-e7a100200bf19655f7ebc100ff13ba6d4adfca78.tar.bz2
samba-e7a100200bf19655f7ebc100ff13ba6d4adfca78.zip
s3:smbd/pipes: avoid passing server_event_context() as event context to np_{read,write}_send
metze
-rw-r--r--source3/smbd/ipc.c4
-rw-r--r--source3/smbd/pipes.c6
-rw-r--r--source3/smbd/smb2_read.c2
-rw-r--r--source3/smbd/smb2_write.c2
4 files changed, 7 insertions, 7 deletions
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);