summaryrefslogtreecommitdiff
path: root/source4/smb_server/smb
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2007-02-07 00:21:29 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:44:45 -0500
commit21650cf3779f20aad808f8ce4e95daa7a2d0e1e7 (patch)
tree5c8ffd34aaf5c66de67c15f421fba4b9f4cf28b7 /source4/smb_server/smb
parent6d7039026c9b6f077f3d2453fb9381be32f332f8 (diff)
downloadsamba-21650cf3779f20aad808f8ce4e95daa7a2d0e1e7.tar.gz
samba-21650cf3779f20aad808f8ce4e95daa7a2d0e1e7.tar.bz2
samba-21650cf3779f20aad808f8ce4e95daa7a2d0e1e7.zip
r21206: - a couple more nttrans places were a memcpy() should be used
- changed the setup array in nttrans to be a uint8 array, instead of a uint16 array. This makes it clearer that it is the job of the caller to do any byte swapping within that data (This used to be commit fa3c9b29ae1c7c6a9bc97484cc386aeec9b5d266)
Diffstat (limited to 'source4/smb_server/smb')
-rw-r--r--source4/smb_server/smb/nttrans.c12
1 files changed, 4 insertions, 8 deletions
diff --git a/source4/smb_server/smb/nttrans.c b/source4/smb_server/smb/nttrans.c
index e85da29806..9f44dbb98b 100644
--- a/source4/smb_server/smb/nttrans.c
+++ b/source4/smb_server/smb/nttrans.c
@@ -47,7 +47,7 @@ static NTSTATUS nttrans_setup_reply(struct nttrans_op *op,
{
trans->out.setup_count = setup_count;
if (setup_count != 0) {
- trans->out.setup = talloc_zero_array(op, uint16_t, setup_count);
+ trans->out.setup = talloc_zero_array(op, uint8_t, setup_count*2);
NT_STATUS_HAVE_NO_MEMORY(trans->out.setup);
}
trans->out.params = data_blob_talloc(op, NULL, param_size);
@@ -499,7 +499,6 @@ static void reply_nttrans_send(struct ntvfs_request *ntvfs)
uint16_t this_data, this_param, max_bytes;
uint_t align1 = 1, align2 = (params_left ? 2 : 0);
struct smbsrv_request *this_req;
- int i;
max_bytes = req_max_data(req) - (align1 + align2);
@@ -539,10 +538,8 @@ static void reply_nttrans_send(struct ntvfs_request *ntvfs)
SIVAL(this_req->out.vwv, 31, PTR_DIFF(data, trans->out.data.data));
SCVAL(this_req->out.vwv, 35, trans->out.setup_count);
- for (i=0;i<trans->out.setup_count;i++) {
- SSVAL(this_req->out.vwv, VWV(18+i), trans->out.setup[i]);
- }
-
+ memcpy((char *)(this_req->out.vwv) + VWV(18), trans->out.setup,
+ sizeof(uint16_t) * trans->out.setup_count);
memset(this_req->out.data, 0, align1);
if (this_param != 0) {
memcpy(this_req->out.data + align1, params, this_param);
@@ -611,12 +608,11 @@ void smbsrv_reply_nttrans(struct smbsrv_request *req)
}
/* parse out the setup words */
- trans->in.setup = talloc_array(req, uint16_t, trans->in.setup_count);
+ trans->in.setup = talloc_array(req, uint8_t, trans->in.setup_count*2);
if (!trans->in.setup) {
smbsrv_send_error(req, NT_STATUS_NO_MEMORY);
return;
}
-
memcpy(trans->in.setup, (char *)(req->in.vwv) + VWV(19),
sizeof(uint16_t) * trans->in.setup_count);