[SCM] Samba Shared Repository - branch v4-8-test updated

Karolin Seeger kseeger at samba.org
Thu Nov 1 17:59:02 UTC 2018

The branch, v4-8-test has been updated
       via  bfa9fd3 vfs_fruit: remove check for number of xattrs from ad_convert_xattr
      from  ec065a8 ctdb-event: Check the return status of sock_daemon_set_startup_fd


- Log -----------------------------------------------------------------
commit bfa9fd3162114961c5f6ad3a15fb1cd257cac2f9
Author: Ralph Boehme <slow at samba.org>
Date:   Fri Oct 19 12:15:42 2018 +0200

    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>
    Reviewed-by: Jeremy Allison <jra at samba.org>
    (cherry picked from commit 5d565f636fcf49fc1bbbfbc24ef730d2f7cc2cf0)
    Autobuild-User(v4-8-test): Karolin Seeger <kseeger at samba.org>
    Autobuild-Date(v4-8-test): Thu Nov  1 18:58:13 CET 2018 on sn-devel-144


Summary of changes:
 source3/modules/vfs_fruit.c | 4 ----
 1 file changed, 4 deletions(-)

Changeset truncated at 500 lines:

diff --git a/source3/modules/vfs_fruit.c b/source3/modules/vfs_fruit.c
index 200ef4a..44fa50d 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;

Samba Shared Repository

More information about the samba-cvs mailing list