From: Stefan Metzmacher <metze@samba.org>
Date: Mon, 7 Jul 2008 12:00:53 +0000 (+0200)
Subject: smb_server/smb: trans(2) setup count is uint8_t
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1b507a9b8e2ede5a4eb542bdf7a0eab9269b9f7b;p=thirdparty%2Fsamba.git

smb_server/smb: trans(2) setup count is uint8_t

metze
---

diff --git a/source/smb_server/smb/trans2.c b/source/smb_server/smb/trans2.c
index 5d206f9ea8a..6dd69de436c 100644
--- a/source/smb_server/smb/trans2.c
+++ b/source/smb_server/smb/trans2.c
@@ -64,7 +64,7 @@ struct trans_op {
 /* setup a trans2 reply, given the data and params sizes */
 static NTSTATUS trans2_setup_reply(struct smb_trans2 *trans,
 				   uint16_t param_size, uint16_t data_size,
-				   uint16_t setup_count)
+				   uint8_t setup_count)
 {
 	trans->out.setup_count = setup_count;
 	if (setup_count > 0) {
@@ -1157,7 +1157,8 @@ static void reply_trans_send(struct ntvfs_request *ntvfs)
 		      PTR_DIFF(this_req->out.data + this_param, this_req->out.hdr));
 		SSVAL(this_req->out.vwv, VWV(8), PTR_DIFF(data, trans->out.data.data));
 
-		SSVAL(this_req->out.vwv, VWV(9), trans->out.setup_count);
+		SCVAL(this_req->out.vwv, VWV(9), trans->out.setup_count);
+		SCVAL(this_req->out.vwv, VWV(9)+1, 0); /* reserved */
 		for (i=0;i<trans->out.setup_count;i++) {
 			SSVAL(this_req->out.vwv, VWV(10+i), trans->out.setup[i]);
 		}