s3:smbd/pipes: avoid passing server_event_context() as event context to np_{read...

metze

diff --git a/source3/smbd/ipc.c b/source3/smbd/ipc.c
index 84cf1c54f710ab216c2a86570c2e5fbf35a5f2db..36c29164f069837743fe8a2d08d7a9bb4ae11917 100644 (file)
--- 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 2ff3779b0e9720f4eec4bdc30698854ae2b80024..b680087dd4298b1ea24eac06fa243a2843f92e51 100644 (file)
--- 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 08622092c6441fd85e25e935f379b1218b80eb26..24ec3e12fc2eb6f935ba47cebca04ee563dfa41c 100644 (file)
--- 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 14d384fff3eb5629c401acf6f431fed4e98a622e..27113350c6545e4d1ccc455abacdbc29e6766c83 100644 (file)
--- 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);