sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-22 02:50:28 +03:00
Code

vfs_fruit: add check for OS X filler in FinderInfo conversion

Browse Source 
This ensures that the function only acts on AppleDouble files created by
macOS and not AppleDouble files created by us that are already in the
correct format (only using the Resource Fork).

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

Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
(cherry picked from commit 5598e6bc3583a88f474afa2996d1f9362d1bd9fb)
This commit is contained in:
Ralph Boehme 2018-10-08 12:51:37 +02:00 committed by Karolin Seeger
parent 0d1f964b60
commit 85519ed981
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source3/modules/vfs_fruit.c
View File

@ -1169,6 +1169,12 @@ static bool ad_convert_finderinfo(struct adouble *ad,
ssize_t nwritten;
NTSTATUS status;
int saved_errno = 0;
int cmp;
cmp = memcmp(ad->ad_filler, AD_FILLER_TAG_OSX, ADEDLEN_FILLER);
if (cmp != 0) {
return true;
}
p_ad = ad_get_entry(ad, ADEID_FINDERI);
if (p_ad == NULL) {