diff options
| author | Jeremy Allison <jra@samba.org> | 2005-03-25 23:45:11 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 10:56:20 -0500 |
| commit | e2204e24ba39f90fdea6a4de458f81373368eb42 (patch) | |
| tree | 3490f570a83da3bfd62e8fb0ff7fd1141dcc48fa /source3/smbd | |
| parent | 10fe0ae721194157d87f306feab30b5f3f42c9b9 (diff) | |
| download | samba-e2204e24ba39f90fdea6a4de458f81373368eb42.tar.gz samba-e2204e24ba39f90fdea6a4de458f81373368eb42.tar.bz2 samba-e2204e24ba39f90fdea6a4de458f81373368eb42.zip | |
r6067: Patch from Marcel Müller <mueller@maazl.de> - fix OS/2 EA_FROM_LIST
info level.
Jeremy.
(This used to be commit e15c36e9497b5e92c0f743a522cd0adb96d22295)
Diffstat (limited to 'source3/smbd')
| -rw-r--r-- | source3/smbd/trans2.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c index 8208bf54bb..b1beed82ac 100644 --- a/source3/smbd/trans2.c +++ b/source3/smbd/trans2.c @@ -2865,25 +2865,17 @@ total_data=%u (should be %u)\n", (unsigned int)total_data, (unsigned int)IVAL(pd struct ea_list *ea_file_list = NULL; DEBUG(10,("call_trans2qfilepathinfo: SMB_INFO_QUERY_EAS_FROM_LIST\n")); - put_dos_date2(pdata,0,c_time); - put_dos_date2(pdata,4,sbuf.st_atime); - put_dos_date2(pdata,8,sbuf.st_mtime); - SIVAL(pdata,12,(uint32)file_size); - SIVAL(pdata,16,(uint32)allocation_size); - SIVAL(pdata,20,mode); ea_file_list = get_ea_list_from_file(ea_ctx, conn, fsp, fname, &total_ea_len); - ea_list = ea_list_union(ea_list, ea_file_list, &total_ea_len); - if (!ea_list || (total_ea_len > data_size - 24)) { + if (!ea_list || (total_ea_len > data_size)) { talloc_destroy(ea_ctx); data_size = 4; break; } - data_size = fill_ea_buffer(ea_ctx, pdata + 24, data_size - 24, conn, ea_list); - data_size += 24; + data_size = fill_ea_buffer(ea_ctx, pdata, data_size, conn, ea_list); talloc_destroy(ea_ctx); break; } |