sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-29 11:21:54 +03:00
Code

r2784: - fixed alignment of ascii directory listings

Browse Source 
- fixed minimum parameter size for ascii qpathinfo call
This commit is contained in:
Andrew Tridgell 2004-10-02 12:16:46 +00:00 committed by Gerald (Jerry) Carter
parent 9a04664531
commit ee065ae7f9
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
source/smb_server/trans2.c
View File

@ -192,6 +192,18 @@ static void trans2_append_data_string(struct smbsrv_request *req,
trans2_grow_data(req, trans, offset + ret); trans2_grow_data(req, trans, offset + ret);
} }
/*
align the end of the data section of a trans reply on an even boundary
*/
static void trans2_align_data(struct smbsrv_request *req, struct smb_trans2 *trans)
{
if ((trans->out.data.length & 1) == 0) {
return;
}
trans2_grow_data(req, trans, trans->out.data.length+1);
SCVAL(trans->out.data.data, trans->out.data.length-1, 0);
}
/* /*
trans2 qfsinfo implementation trans2 qfsinfo implementation
@ -623,7 +635,7 @@ static NTSTATUS trans2_qpathinfo(struct smbsrv_request *req, struct smb_trans2 *
uint16_t level; uint16_t level;
/* make sure we got enough parameters */ /* make sure we got enough parameters */
if (trans->in.params.length < 8) { if (trans->in.params.length < 2) {
return NT_STATUS_FOOBAR; return NT_STATUS_FOOBAR;
} }
@ -997,6 +1009,7 @@ static void find_fill_info(struct smbsrv_request *req,
24, STR_UNICODE | STR_LEN8BIT); 24, STR_UNICODE | STR_LEN8BIT);
trans2_append_data_string(req, trans, &file->both_directory_info.name, trans2_append_data_string(req, trans, &file->both_directory_info.name,
ofs + 60, STR_TERMINATE_ASCII); ofs + 60, STR_TERMINATE_ASCII);
trans2_align_data(req, trans);
data = trans->out.data.data + ofs; data = trans->out.data.data + ofs;
SIVAL(data, 0, trans->out.data.length - ofs); SIVAL(data, 0, trans->out.data.length - ofs);
break; break;