diff options
author | Andrew Tridgell <tridge@samba.org> | 2004-12-17 04:51:23 +0000 |
---|---|---|
committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:07:28 -0500 |
commit | 3b8e83a8c8f32ca658841f1fae344399a48d66a4 (patch) | |
tree | febc6b07ebea32366b3ecc8f7b4862f7294e6798 /source4/smb_server | |
parent | 50005129ab0a5c5f2422460e6d7c19616e5e1124 (diff) | |
download | samba-3b8e83a8c8f32ca658841f1fae344399a48d66a4.tar.gz samba-3b8e83a8c8f32ca658841f1fae344399a48d66a4.tar.bz2 samba-3b8e83a8c8f32ca658841f1fae344399a48d66a4.zip |
r4243: a sniff from kukks showed that the ea_set interface in trans2 setfileinfo allows
for multiple EAs to be set at once. This fixes all the ea code to allow for that.
(This used to be commit b26828bef5d55e5eef0e34a164e76292df45e207)
Diffstat (limited to 'source4/smb_server')
-rw-r--r-- | source4/smb_server/trans2.c | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/source4/smb_server/trans2.c b/source4/smb_server/trans2.c index a8cad915f9..3ca9bafcfa 100644 --- a/source4/smb_server/trans2.c +++ b/source4/smb_server/trans2.c @@ -827,21 +827,9 @@ static NTSTATUS trans2_parse_sfileinfo(struct smbsrv_request *req, return NT_STATUS_OK; case RAW_SFILEINFO_EA_SET: - CHECK_MIN_BLOB_SIZE(blob, 4); - len = IVAL(blob->data, 0); - if (len > blob->length || len < 4) { - return NT_STATUS_INFO_LENGTH_MISMATCH; - } - { - DATA_BLOB blob2; - blob2.data = blob->data+4; - blob2.length = len-4; - len = ea_pull_struct(&blob2, req, &st->ea_set.in.ea); - } - if (len == 0) { - return NT_STATUS_INVALID_PARAMETER; - } - return NT_STATUS_OK; + return ea_pull_list(blob, req, + &st->ea_set.in.num_eas, + &st->ea_set.in.eas); case SMB_SFILEINFO_BASIC_INFO: case SMB_SFILEINFO_BASIC_INFORMATION: |