[SCM] Samba Shared Repository - branch master updated
Stefan Metzmacher
metze at samba.org
Sun Aug 5 12:01:02 MDT 2012
The branch, master has been updated
via 7327310 s3:smb2_server: use 'i' instead of '1' as vector index in smbd_smb2_request_pending_timer()
via 1a0c40f s3:smb2_lock: remove unused in_smbpid
via 96fa47f s3:smb2_write: remove unused in_smbpid
via 056070f s3:smb2_read: remove unused in_smbpid
from 86ee590 s4:domain join: setup RODC invocationId
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 7327310754045e8a2029098ce76a0e677c590460
Author: Stefan Metzmacher <metze at samba.org>
Date: Sun Aug 5 16:35:08 2012 +0200
s3:smb2_server: use 'i' instead of '1' as vector index in smbd_smb2_request_pending_timer()
If we reach this code i is currently always 1, but it's easier to unstand this
way.
metze
Autobuild-User(master): Stefan Metzmacher <metze at samba.org>
Autobuild-Date(master): Sun Aug 5 20:00:26 CEST 2012 on sn-devel-104
commit 1a0c40f53748198342089b567183a24f9e5e1639
Author: Stefan Metzmacher <metze at samba.org>
Date: Sun Aug 5 14:26:40 2012 +0200
s3:smb2_lock: remove unused in_smbpid
metze
commit 96fa47f56e7f604ba7ed60abb27f587c597db04e
Author: Stefan Metzmacher <metze at samba.org>
Date: Sun Aug 5 14:26:40 2012 +0200
s3:smb2_write: remove unused in_smbpid
metze
commit 056070f395f4c20bac17dac99518e9b84366817e
Author: Stefan Metzmacher <metze at samba.org>
Date: Sun Aug 5 14:25:48 2012 +0200
s3:smb2_read: remove unused in_smbpid
metze
-----------------------------------------------------------------------
Summary of changes:
source3/smbd/smb2_lock.c | 8 --------
source3/smbd/smb2_read.c | 8 --------
source3/smbd/smb2_server.c | 4 ++--
source3/smbd/smb2_write.c | 8 --------
4 files changed, 2 insertions(+), 26 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/smbd/smb2_lock.c b/source3/smbd/smb2_lock.c
index b4d21a3..aacf189 100644
--- a/source3/smbd/smb2_lock.c
+++ b/source3/smbd/smb2_lock.c
@@ -47,7 +47,6 @@ static struct tevent_req *smbd_smb2_lock_send(TALLOC_CTX *mem_ctx,
struct tevent_context *ev,
struct smbd_smb2_request *smb2req,
struct files_struct *in_fsp,
- uint32_t in_smbpid,
uint16_t in_lock_count,
struct smbd_smb2_lock_element *in_locks);
static NTSTATUS smbd_smb2_lock_recv(struct tevent_req *req);
@@ -55,10 +54,8 @@ static NTSTATUS smbd_smb2_lock_recv(struct tevent_req *req);
static void smbd_smb2_request_lock_done(struct tevent_req *subreq);
NTSTATUS smbd_smb2_request_process_lock(struct smbd_smb2_request *req)
{
- const uint8_t *inhdr;
const uint8_t *inbody;
const int i = req->current_idx;
- uint32_t in_smbpid;
uint16_t in_lock_count;
uint64_t in_file_id_persistent;
uint64_t in_file_id_volatile;
@@ -73,11 +70,8 @@ NTSTATUS smbd_smb2_request_process_lock(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_lock_count = CVAL(inbody, 0x02);
/* 0x04 - 4 bytes reserved */
in_file_id_persistent = BVAL(inbody, 0x08);
@@ -123,7 +117,6 @@ NTSTATUS smbd_smb2_request_process_lock(struct smbd_smb2_request *req)
subreq = smbd_smb2_lock_send(req, req->sconn->ev_ctx,
req, in_fsp,
- in_smbpid,
in_lock_count,
in_locks);
if (subreq == NULL) {
@@ -206,7 +199,6 @@ static struct tevent_req *smbd_smb2_lock_send(TALLOC_CTX *mem_ctx,
struct tevent_context *ev,
struct smbd_smb2_request *smb2req,
struct files_struct *fsp,
- uint32_t in_smbpid,
uint16_t in_lock_count,
struct smbd_smb2_lock_element *in_locks)
{
diff --git a/source3/smbd/smb2_read.c b/source3/smbd/smb2_read.c
index 289cbc0..7fdbfaa 100644
--- a/source3/smbd/smb2_read.c
+++ b/source3/smbd/smb2_read.c
@@ -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,
diff --git a/source3/smbd/smb2_server.c b/source3/smbd/smb2_server.c
index 979a179..3fc5690 100644
--- a/source3/smbd/smb2_server.c
+++ b/source3/smbd/smb2_server.c
@@ -1106,8 +1106,8 @@ static void smbd_smb2_request_pending_timer(struct tevent_context *ev,
TALLOC_FREE(req->async_te);
/* Ensure our final reply matches the interim one. */
- inhdr = (const uint8_t *)req->in.vector[1].iov_base;
- outhdr = (uint8_t *)req->out.vector[1].iov_base;
+ inhdr = (const uint8_t *)req->in.vector[i].iov_base;
+ outhdr = (uint8_t *)req->out.vector[i].iov_base;
flags = IVAL(outhdr, SMB2_HDR_FLAGS);
message_id = BVAL(outhdr, SMB2_HDR_MESSAGE_ID);
diff --git a/source3/smbd/smb2_write.c b/source3/smbd/smb2_write.c
index 9b06b87..c649bef 100644
--- a/source3/smbd/smb2_write.c
+++ b/source3/smbd/smb2_write.c
@@ -29,7 +29,6 @@ static struct tevent_req *smbd_smb2_write_send(TALLOC_CTX *mem_ctx,
struct tevent_context *ev,
struct smbd_smb2_request *smb2req,
struct files_struct *in_fsp,
- uint32_t in_smbpid,
DATA_BLOB in_data,
uint64_t in_offset,
uint32_t in_flags);
@@ -40,10 +39,8 @@ static void smbd_smb2_request_write_done(struct tevent_req *subreq);
NTSTATUS smbd_smb2_request_process_write(struct smbd_smb2_request *req)
{
NTSTATUS status;
- const uint8_t *inhdr;
const uint8_t *inbody;
int i = req->current_idx;
- uint32_t in_smbpid;
uint16_t in_data_offset;
uint32_t in_data_length;
DATA_BLOB in_data_buffer;
@@ -58,11 +55,8 @@ NTSTATUS smbd_smb2_request_process_write(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_data_offset = SVAL(inbody, 0x02);
in_data_length = IVAL(inbody, 0x04);
in_offset = BVAL(inbody, 0x08);
@@ -101,7 +95,6 @@ NTSTATUS smbd_smb2_request_process_write(struct smbd_smb2_request *req)
subreq = smbd_smb2_write_send(req, req->sconn->ev_ctx,
req, in_fsp,
- in_smbpid,
in_data_buffer,
in_offset,
in_flags);
@@ -253,7 +246,6 @@ static struct tevent_req *smbd_smb2_write_send(TALLOC_CTX *mem_ctx,
struct tevent_context *ev,
struct smbd_smb2_request *smb2req,
struct files_struct *fsp,
- uint32_t in_smbpid,
DATA_BLOB in_data,
uint64_t in_offset,
uint32_t in_flags)
--
Samba Shared Repository
More information about the samba-cvs
mailing list