sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-25 06:04:04 +03:00
Code

vfs_fruit: move FinderInfo lenght check to ad_convert()

Browse Source 
The final step in consolidating all conversion related work in
ad_convert(). No change in behaviour.

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>
This commit is contained in:
Ralph Boehme 2018-10-05 16:26:46 +02:00
parent d27d0326c3
commit 4f1174b6eb
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source3/modules/vfs_fruit.c
View File

@ -1170,6 +1170,10 @@ static int ad_convert(struct adouble *ad,
ssize_t len; ssize_t len;
bool ok; bool ok;
if (ad_getentrylen(ad, ADEID_FINDERI) == ADEDLEN_FINDERI) {
return 0;
}
origlen = ad_getentryoff(ad, ADEID_RFORK) + origlen = ad_getentryoff(ad, ADEID_RFORK) +
ad_getentrylen(ad, ADEID_RFORK); ad_getentrylen(ad, ADEID_RFORK);
@ -1485,10 +1489,6 @@ static ssize_t ad_read_rsrc_adouble(struct adouble *ad,
return -1; return -1;
} }
if (ad_getentrylen(ad, ADEID_FINDERI) == ADEDLEN_FINDERI) {
return len;
}
/* /*
* Try to fixup AppleDouble files created by OS X with xattrs * Try to fixup AppleDouble files created by OS X with xattrs
* appended to the ADEID_FINDERI entry. * appended to the ADEID_FINDERI entry.