summaryrefslogtreecommitdiff
path: root/source4/smb_server
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2008-07-07 14:00:53 +0200
committerStefan Metzmacher <metze@samba.org>2008-07-07 18:10:08 +0200
commit1bc344cf523172fc940ab9cf7a086718aebb7ef1 (patch)
treea1f207619f1a4f7d7fcff9e574435593fb838720 /source4/smb_server
parent848ab7fa3be4c4fe2a103df365f0b6b41ee0736d (diff)
downloadsamba-1bc344cf523172fc940ab9cf7a086718aebb7ef1.tar.gz
samba-1bc344cf523172fc940ab9cf7a086718aebb7ef1.tar.bz2
samba-1bc344cf523172fc940ab9cf7a086718aebb7ef1.zip
smb_server/smb: trans(2) setup count is uint8_t
metze (This used to be commit 1b507a9b8e2ede5a4eb542bdf7a0eab9269b9f7b)
Diffstat (limited to 'source4/smb_server')
-rw-r--r--source4/smb_server/smb/trans2.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/source4/smb_server/smb/trans2.c b/source4/smb_server/smb/trans2.c
index 5d206f9ea8..6dd69de436 100644
--- a/source4/smb_server/smb/trans2.c
+++ b/source4/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]);
}