From: Ralph Boehme <slow@samba.org>
Date: Fri, 19 Oct 2018 10:15:42 +0000 (+0200)
Subject: vfs_fruit: remove check for number of xattrs from ad_convert_xattr
X-Git-Tag: tdb-1.3.17~1132
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5d565f636fcf49fc1bbbfbc24ef730d2f7cc2cf0;p=thirdparty%2Fsamba.git

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>
---

diff --git a/source3/modules/vfs_fruit.c b/source3/modules/vfs_fruit.c
index 30fab85ee98..a3dabcd31c1 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;