Author: tridge Date: 2004-08-25 04:16:48 +0000 (Wed, 25 Aug 2004) New Revision: 2046
WebSVN: http://websvn.samba.org/websvn/changeset.php?rep=samba&path=/&rev=2046&nolog=1 Log: fixed two server packet format errors found with the RAW-* tests Modified: branches/SAMBA_4_0/source/smb_server/trans2.c Changeset: Modified: branches/SAMBA_4_0/source/smb_server/trans2.c =================================================================== --- branches/SAMBA_4_0/source/smb_server/trans2.c 2004-08-25 04:16:14 UTC (rev 2045) +++ branches/SAMBA_4_0/source/smb_server/trans2.c 2004-08-25 04:16:48 UTC (rev 2046) @@ -925,7 +925,7 @@ SSVAL(data, 20, file->ea_size.attrib); SIVAL(data, 22, file->ea_size.ea_size); trans2_append_data_string(req, trans, &file->ea_size.name, - ofs + 26, STR_LEN8BIT | STR_TERMINATE | STR_NOALIGN); + ofs + 26, STR_LEN8BIT | STR_NOALIGN); break; case RAW_SEARCH_DIRECTORY_INFO: @@ -1030,13 +1030,12 @@ SIVAL(data, 56, file->id_both_directory_info.attrib); SIVAL(data, 64, file->id_both_directory_info.ea_size); SCVAL(data, 69, 0); /* reserved */ - memset(data+70,0,24); + memset(data+70,0,26); trans2_push_data_string(req, trans, 68 + ofs, 70 + ofs, &file->id_both_directory_info.short_name, 24, STR_UNICODE | STR_LEN8BIT); - SBVAL(data, 94, file->id_both_directory_info.file_id); - SSVAL(data, 102, 0); /* reserved? */ + SBVAL(data, 96, file->id_both_directory_info.file_id); trans2_append_data_string(req, trans, &file->id_both_directory_info.name, ofs + 60, STR_TERMINATE_ASCII); data = trans->out.data.data + ofs;
