]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
vfs_fruit: ignore AppleDouble files in fruit_unlink()
authorRalph Boehme <slow@samba.org>
Tue, 21 May 2019 09:42:47 +0000 (11:42 +0200)
committerKarolin Seeger <kseeger@samba.org>
Fri, 21 Jun 2019 07:56:19 +0000 (07:56 +0000)
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 <slow@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
(cherry picked from commit 797dc649456f39add4af8b54b60db0268ad4e90e)

source3/modules/vfs_fruit.c

index e1d0d5ecc66ad67a9b4bfaee01204a467d5494ea..801b8642b6e6b5fc8d7c967be9a13ad39eac2fdb 100644 (file)
@@ -4081,6 +4081,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);
        }
 
        /*