From: Ralph Boehme Date: Tue, 21 May 2019 09:42:47 +0000 (+0200) Subject: vfs_fruit: ignore AppleDouble files in fruit_unlink() X-Git-Tag: ldb-2.0.5~543 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=797dc649456f39add4af8b54b60db0268ad4e90e;p=thirdparty%2Fsamba.git vfs_fruit: ignore AppleDouble files in fruit_unlink() Otherwise, if SMB_VFS_UNLINK() is called for an AppleDouble path "._file", we try to delete "._._file" which doesn't make sense. AppleDouble files don't have AppleDouble themselves. Bug: https://bugzilla.samba.org/show_bug.cgi?id=13968 Signed-off-by: Ralph Boehme Reviewed-by: Jeremy Allison --- diff --git a/source3/modules/vfs_fruit.c b/source3/modules/vfs_fruit.c index 6e909d7073d..2bd4fbadf37 100644 --- a/source3/modules/vfs_fruit.c +++ b/source3/modules/vfs_fruit.c @@ -4104,6 +4104,8 @@ static int fruit_unlink(vfs_handle_struct *handle, return fruit_unlink_rsrc(handle, smb_fname, false); } else if (is_ntfs_stream_smb_fname(smb_fname)) { return SMB_VFS_NEXT_UNLINK(handle, smb_fname); + } else if (is_adouble_file(smb_fname->base_name)) { + return SMB_VFS_NEXT_UNLINK(handle, smb_fname); } /*