sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-27 03:21:53 +03:00
Code

s3:smb2_server: remove unused 'sconn' from smbd_smb2_request_pending_state

Browse Source 
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
This commit is contained in:
Stefan Metzmacher 2014-06-11 11:22:16 +02:00 committed by Michael Adam
parent a319b89687
commit cedf403bcf
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
source3/smbd/smb2_server.c
View File

@ -1278,7 +1278,6 @@ static NTSTATUS smb2_send_async_interim_response(const struct smbd_smb2_request
} }
struct smbd_smb2_request_pending_state { struct smbd_smb2_request_pending_state {
struct smbd_server_connection *sconn;
struct smbd_smb2_send_queue queue_entry; struct smbd_smb2_send_queue queue_entry;
uint8_t buf[NBT_HDR_SIZE + SMB2_TF_HDR_SIZE + SMB2_HDR_BODY + 0x08 + 1]; uint8_t buf[NBT_HDR_SIZE + SMB2_TF_HDR_SIZE + SMB2_HDR_BODY + 0x08 + 1];
struct iovec vector[1 + SMBD_SMB2_NUM_IOV_PER_REQ]; struct iovec vector[1 + SMBD_SMB2_NUM_IOV_PER_REQ];
@ -1426,8 +1425,7 @@ static void smbd_smb2_request_pending_timer(struct tevent_context *ev,
struct smbd_smb2_request *req = struct smbd_smb2_request *req =
talloc_get_type_abort(private_data, talloc_get_type_abort(private_data,
struct smbd_smb2_request); struct smbd_smb2_request);
struct smbd_server_connection *sconn = req->sconn; struct smbXsrv_connection *xconn = req->xconn;
struct smbXsrv_connection *xconn = sconn->conn;
struct smbd_smb2_request_pending_state *state = NULL; struct smbd_smb2_request_pending_state *state = NULL;
uint8_t *outhdr = NULL; uint8_t *outhdr = NULL;
const uint8_t *inhdr = NULL; const uint8_t *inhdr = NULL;
@ -1475,7 +1473,6 @@ static void smbd_smb2_request_pending_timer(struct tevent_context *ev,
nt_errstr(NT_STATUS_NO_MEMORY)); nt_errstr(NT_STATUS_NO_MEMORY));
return; return;
} }
state->sconn = req->sconn;
tf = state->buf + NBT_HDR_SIZE; tf = state->buf + NBT_HDR_SIZE;
tf_len = SMB2_TF_HDR_SIZE; tf_len = SMB2_TF_HDR_SIZE;
@ -1603,7 +1600,7 @@ static void smbd_smb2_request_pending_timer(struct tevent_context *ev,
status = smbd_smb2_flush_send_queue(xconn); status = smbd_smb2_flush_send_queue(xconn);
if (!NT_STATUS_IS_OK(status)) { if (!NT_STATUS_IS_OK(status)) {
smbd_server_connection_terminate(sconn, smbd_server_connection_terminate(req->sconn,
nt_errstr(status)); nt_errstr(status));
return; return;
} }