[SCM] Samba Shared Repository - branch master updated

[Jeremy Allison]

The branch, master has been updated
       via  3d113a6... Ensure we total up the correct number of creds requested in a compound request.
      from  9c41011... Parameterize "smb2 max read", "smb2 max write", "smb2 max trans".

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 3d113a6ffb91ccc760015b8ef74cc4ba4cbdf5fd
Author: Jeremy Allison <jra at samba.org>
Date:   Tue Apr 6 16:31:26 2010 -0700

    Ensure we total up the correct number of creds requested in a compound request.

-----------------------------------------------------------------------

Summary of changes:
 source3/smbd/smb2_server.c |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/smbd/smb2_server.c b/source3/smbd/smb2_server.c
index c64f82f..7fd3ef4 100644
--- a/source3/smbd/smb2_server.c
+++ b/source3/smbd/smb2_server.c
@@ -249,6 +249,7 @@ static NTSTATUS smbd_smb2_request_validate(struct smbd_smb2_request *req,
 	}
 
 	for (idx=1; idx < count; idx += 3) {
+		uint16_t creds_requested = 0;
 		const uint8_t *inhdr = NULL;
 		uint32_t flags;
 
@@ -267,7 +268,12 @@ static NTSTATUS smbd_smb2_request_validate(struct smbd_smb2_request *req,
 			return NT_STATUS_INVALID_PARAMETER;
 		}
 
-		*p_creds_requested = SVAL(inhdr, SMB2_HDR_CREDIT);
+		creds_requested = SVAL(inhdr, SMB2_HDR_CREDIT);
+		if (*p_creds_requested + creds_requested < creds_requested) {
+			*p_creds_requested = 65535;
+		} else {
+			*p_creds_requested += creds_requested;
+		}
 
 		flags = IVAL(inhdr, SMB2_HDR_FLAGS);
 		if (idx == 1) {


-- 
Samba Shared Repository