]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
s3:smb2_read: remove unused in_smbpid
authorStefan Metzmacher <metze@samba.org>
Sun, 5 Aug 2012 12:25:48 +0000 (14:25 +0200)
committerStefan Metzmacher <metze@samba.org>
Sun, 5 Aug 2012 14:39:30 +0000 (16:39 +0200)
metze

source3/smbd/smb2_read.c

index 289cbc020842ec7f75e4027bc8393a0ba5835fe0..7fdbfaab00276a1654e9421eceb9ea976fcc3911 100644 (file)
@@ -31,7 +31,6 @@ static struct tevent_req *smbd_smb2_read_send(TALLOC_CTX *mem_ctx,
                                              struct tevent_context *ev,
                                              struct smbd_smb2_request *smb2req,
                                              struct files_struct *in_fsp,
-                                             uint32_t in_smbpid,
                                              uint32_t in_length,
                                              uint64_t in_offset,
                                              uint32_t in_minimum,
@@ -45,10 +44,8 @@ static void smbd_smb2_request_read_done(struct tevent_req *subreq);
 NTSTATUS smbd_smb2_request_process_read(struct smbd_smb2_request *req)
 {
        NTSTATUS status;
-       const uint8_t *inhdr;
        const uint8_t *inbody;
        int i = req->current_idx;
-       uint32_t in_smbpid;
        uint32_t in_length;
        uint64_t in_offset;
        uint64_t in_file_id_persistent;
@@ -62,11 +59,8 @@ NTSTATUS smbd_smb2_request_process_read(struct smbd_smb2_request *req)
        if (!NT_STATUS_IS_OK(status)) {
                return smbd_smb2_request_error(req, status);
        }
-       inhdr = (const uint8_t *)req->in.vector[i+0].iov_base;
        inbody = (const uint8_t *)req->in.vector[i+1].iov_base;
 
-       in_smbpid = IVAL(inhdr, SMB2_HDR_PID);
-
        in_length               = IVAL(inbody, 0x04);
        in_offset               = BVAL(inbody, 0x08);
        in_file_id_persistent   = BVAL(inbody, 0x10);
@@ -94,7 +88,6 @@ NTSTATUS smbd_smb2_request_process_read(struct smbd_smb2_request *req)
 
        subreq = smbd_smb2_read_send(req, req->sconn->ev_ctx,
                                     req, in_fsp,
-                                    in_smbpid,
                                     in_length,
                                     in_offset,
                                     in_minimum_count,
@@ -379,7 +372,6 @@ static struct tevent_req *smbd_smb2_read_send(TALLOC_CTX *mem_ctx,
                                              struct tevent_context *ev,
                                              struct smbd_smb2_request *smb2req,
                                              struct files_struct *fsp,
-                                             uint32_t in_smbpid,
                                              uint32_t in_length,
                                              uint64_t in_offset,
                                              uint32_t in_minimum,