diff options
| author | Ralph Boehme <slow@samba.org> | 2019-05-21 11:42:47 +0200 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2019-06-21 07:56:19 +0000 |
| commit | c2c6377ebf878aec8857579224142a807af3f21b (patch) | |
| tree | 2a513209c0038d0883c22582b386bf86dd743ab5 | |
| parent | 1542bb051bef293abdbbfe2b73b373ca11b8fcf8 (diff) | |
| download | samba-c2c6377ebf878aec8857579224142a807af3f21b.tar.gz | |
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 <slow@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
(cherry picked from commit 797dc649456f39add4af8b54b60db0268ad4e90e)
| -rw-r--r-- | source3/modules/vfs_fruit.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/source3/modules/vfs_fruit.c b/source3/modules/vfs_fruit.c index e1d0d5ecc66..801b8642b6e 100644 --- a/source3/modules/vfs_fruit.c +++ b/source3/modules/vfs_fruit.c @@ -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); } /* |