Attachment 14553 Details for Bug 13649 – Follow-up patch for 4.8 and 4.9, cherry-picked from master

[patch] Follow-up patch for 4.8 and 4.9, cherry-picked from master

bug13649-v48,v49.patch (text/plain), 1.21 KB, created by Ralph Böhme on 2018-10-31 15:03:42 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ralph Böhme

Created: 2018-10-31 15:03:42 UTC

Size: 1.21 KB

patch

obsolete

>From 46326a49f095cb4ec8a654250a8cf44a29ba0457 Mon Sep 17 00:00:00 2001
>From: Ralph Boehme <slow@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@samba.org>
>Reviewed-by: Jeremy Allison <jra@samba.org>
>(cherry picked from commit 5d565f636fcf49fc1bbbfbc24ef730d2f7cc2cf0)
>---
> 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 58ef3cc68d3..4b0e6e3d21f 100644
>--- a/source3/modules/vfs_fruit.c
>+++ b/source3/modules/vfs_fruit.c
>@@ -1014,10 +1014,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
>

Flags:

jra: review+

Actions: View

Attachments on bug 13649: 14527 | 14553