sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-10 01:18:15 +03:00
Code

vfs_fruit: Don't unlink the main file

Browse Source 
The original fix for bug 13441 was missing a check that verifies that
fruit_ftruncate() is actually called on a stream.

Follow-up to

Bug: https://bugzilla.samba.org/show_bug.cgi?id=13441

Pair-Programmed-With: Volker Lendecke <vl@samba.org>

Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>

Autobuild-User(master): Volker Lendecke <vl@samba.org>
Autobuild-Date(master): Thu Aug 23 15:28:48 CEST 2018 on sn-devel-144
This commit is contained in:
Volker Lendecke 2018-08-07 15:10:31 +02:00
parent c39ec64231
commit 8c14234871
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
selftest/knownfail.d/samba3.vfs.fruit
View File

@ -1,2 +1 @@
^samba3.vfs.fruit streams_depot.OS X AppleDouble file conversion\(nt4_dc\) ^samba3.vfs.fruit streams_depot.OS X AppleDouble file conversion\(nt4_dc\)
^samba3.vfs.fruit .*.setinfo eof stream\(nt4_dc\)

6
source3/modules/vfs_fruit.c
View File

@ -5570,7 +5570,11 @@ static int fruit_ftruncate(struct vfs_handle_struct *handle,
(intmax_t)offset); (intmax_t)offset);
if (fio == NULL) { if (fio == NULL) {
if (offset == 0 && global_fruit_config.nego_aapl) { if (offset == 0 &&
global_fruit_config.nego_aapl &&
is_ntfs_stream_smb_fname(fsp->fsp_name) &&
!is_ntfs_default_stream_smb_fname(fsp->fsp_name))
{
return SMB_VFS_NEXT_UNLINK(handle, fsp->fsp_name); return SMB_VFS_NEXT_UNLINK(handle, fsp->fsp_name);
} }
return SMB_VFS_NEXT_FTRUNCATE(handle, fsp, offset); return SMB_VFS_NEXT_FTRUNCATE(handle, fsp, offset);