summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2012-08-05 14:57:35 +0200
committerStefan Metzmacher <metze@samba.org>2012-08-05 20:55:35 +0200
commit121dbd6210c00d3884685351d50c2ce1d0e486e9 (patch)
tree2aeb1de9afa63c9fd87beb019321c429ce5c3127 /source3
parent88a34026f5fd87d8b4a3094a68968686cca8fcf0 (diff)
downloadsamba-121dbd6210c00d3884685351d50c2ce1d0e486e9.tar.gz
samba-121dbd6210c00d3884685351d50c2ce1d0e486e9.tar.bz2
samba-121dbd6210c00d3884685351d50c2ce1d0e486e9.zip
s3:smb2_notify: make use of SMBD_SMB2_IN_*_PTR()
metze
Diffstat (limited to 'source3')
-rw-r--r--source3/smbd/smb2_notify.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/source3/smbd/smb2_notify.c b/source3/smbd/smb2_notify.c
index aa6d1906df..886bc89e99 100644
--- a/source3/smbd/smb2_notify.c
+++ b/source3/smbd/smb2_notify.c
@@ -49,7 +49,6 @@ NTSTATUS smbd_smb2_request_process_notify(struct smbd_smb2_request *req)
{
NTSTATUS status;
const uint8_t *inbody;
- int i = req->current_idx;
uint16_t in_flags;
uint32_t in_output_buffer_length;
uint64_t in_file_id_persistent;
@@ -62,7 +61,7 @@ NTSTATUS smbd_smb2_request_process_notify(struct smbd_smb2_request *req)
if (!NT_STATUS_IS_OK(status)) {
return smbd_smb2_request_error(req, status);
}
- inbody = (const uint8_t *)req->in.vector[i+1].iov_base;
+ inbody = SMBD_SMB2_IN_BODY_PTR(req);
in_flags = SVAL(inbody, 0x02);
in_output_buffer_length = IVAL(inbody, 0x04);
@@ -107,7 +106,6 @@ static void smbd_smb2_request_notify_done(struct tevent_req *subreq)
{
struct smbd_smb2_request *req = tevent_req_callback_data(subreq,
struct smbd_smb2_request);
- int i = req->current_idx;
DATA_BLOB outbody;
DATA_BLOB outdyn;
uint16_t out_output_buffer_offset;
@@ -118,7 +116,7 @@ static void smbd_smb2_request_notify_done(struct tevent_req *subreq)
if (req->cancelled) {
struct smbd_smb2_notify_state *state = tevent_req_data(subreq,
struct smbd_smb2_notify_state);
- const uint8_t *inhdr = (const uint8_t *)req->in.vector[i].iov_base;
+ const uint8_t *inhdr = SMBD_SMB2_IN_HDR_PTR(req);
uint64_t mid = BVAL(inhdr, SMB2_HDR_MESSAGE_ID);
DEBUG(10,("smbd_smb2_request_notify_done: cancelled mid %llu\n",