diff options
| author | Jeremy Allison <jra@samba.org> | 2013-03-27 11:54:34 -0700 |
|---|---|---|
| committer | David Disseldorp <ddiss@samba.org> | 2013-04-02 20:06:38 +0200 |
| commit | 9b94de161f30bb34c666c0cf0cc94250e6a7b863 (patch) | |
| tree | f71928928b0d315591cf6b0cee0ee88ca53c93a0 /source3/smbd | |
| parent | 43becd6f305bd5d21d886027d38a92d4dff22d75 (diff) | |
| download | samba-9b94de161f30bb34c666c0cf0cc94250e6a7b863.tar.gz samba-9b94de161f30bb34c666c0cf0cc94250e6a7b863.tar.bz2 samba-9b94de161f30bb34c666c0cf0cc94250e6a7b863.zip | |
Final fix for bug #9130 - Certain xattrs cause Windows error 0x800700FF
The spec lies when it says that NextEntryOffset is the only value
considered when finding the next EA. We were adding 4 more extra
pad bytes than needed (i.e. if the next entry already was on a 4
byte boundary, then we were adding 4 additional pad bytes).
Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: David Disseldorp <ddiss@suse.de>
Diffstat (limited to 'source3/smbd')
| -rw-r--r-- | source3/smbd/trans2.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c index df6fe92c3a..4cdd2394ca 100644 --- a/source3/smbd/trans2.c +++ b/source3/smbd/trans2.c @@ -499,7 +499,7 @@ static NTSTATUS fill_ea_chained_buffer(TALLOC_CTX *mem_ctx, this_size = 0x08 + dos_namelen + 1 + ea_list->ea.value.length; if (ea_list->next) { - pad = 4 - (this_size % 4); + pad = (4 - (this_size % 4)) % 4; this_size += pad; } |