[PATCH] Follow-up fix for bug 13649

[Jeremy Allison]

On Tue, Oct 23, 2018 at 03:17:48PM +0200, Ralph Böhme wrote:
> Hi Jeremy,
> 
> in the patchseries for the vfs_fruit bug 13649 the conversion refactoring
> added a check that turns out to be preventing conversion for certain
> AppleDouble files.
> 
> Attached is a small follow-up fix, please review & push if happy. Thanks!

LGTM. Sorry for the delay. RB+ and pushed !

Jeremy.

> -- 
> Ralph Boehme, Samba Team       https://samba.org/
> Samba Developer, SerNet GmbH   https://sernet.de/en/samba/
> GPG Key Fingerprint:           FAE2 C608 8A24 2520 51C5
>                               59E4 AA1E 9B71 2639 9E46

> From 9733181bd9586cd98ddc186ca57fad23562b0fe6 Mon Sep 17 00:00:00 2001
> From: Ralph Boehme <slow at samba.org>
> Date: Fri, 19 Oct 2018 12:15:42 +0200
> Subject: [PATCH] vfs_fruit: remove check for number of xattrs from
>  ad_convert_xattr
> 
> Turns out that there exist AppleDouble files with an extended FinderInfo
> entry that includes the xattr marshall buffer, but the count of xattrs
> in the buffer is just zero.
> 
> We do want to discard this extended FinderInfo entry and convert it to a
> simple fixed size FinderInfo entry, so remove the check.
> 
> Bug: https://bugzilla.samba.org/show_bug.cgi?id=13649
> 
> Signed-off-by: Ralph Boehme <slow at samba.org>
> ---
>  source3/modules/vfs_fruit.c | 4 ----
>  1 file changed, 4 deletions(-)
> 
> diff --git a/source3/modules/vfs_fruit.c b/source3/modules/vfs_fruit.c
> index c420d78930e..9f195f5ade4 100644
> --- a/source3/modules/vfs_fruit.c
> +++ b/source3/modules/vfs_fruit.c
> @@ -1055,10 +1055,6 @@ static bool ad_convert_xattr(struct adouble *ad,
>  		return true;
>  	}
>  
> -	if (ad->adx_header.adx_num_attrs == 0) {
> -		return true;
> -	}
> -
>  	if (string_replace_cmaps == NULL) {
>  		const char **mappings = NULL;
>  
> -- 
> 2.17.2
>