summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2004-08-25 04:16:48 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:58:20 -0500
commit15d0ce19772a0890e26af5ceeea1844a5f65d83c (patch)
treebfa733174e20b6460be822fe7695e0f4c4cb3271
parentcc7d62d3d14d30b678b8e6ffc038d1ed740ca9c5 (diff)
downloadsamba-15d0ce19772a0890e26af5ceeea1844a5f65d83c.tar.gz
samba-15d0ce19772a0890e26af5ceeea1844a5f65d83c.tar.bz2
samba-15d0ce19772a0890e26af5ceeea1844a5f65d83c.zip
r2046: fixed two server packet format errors found with the RAW-* tests
(This used to be commit 9fdbe60230741e11478871072a40c8bc8124b5ea)
-rw-r--r--source4/smb_server/trans2.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/source4/smb_server/trans2.c b/source4/smb_server/trans2.c
index c6b98b85d3..c8b73ca4c6 100644
--- a/source4/smb_server/trans2.c
+++ b/source4/smb_server/trans2.c
@@ -925,7 +925,7 @@ static void find_fill_info(struct smbsrv_request *req,
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 @@ static void find_fill_info(struct smbsrv_request *req,
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;