From: Ralph Boehme <slow@samba.org>
Date: Wed, 22 May 2019 16:08:14 +0000 (+0200)
Subject: vfs_fruit: use stream code for resource fork size calculation in readdir_attr_rfork_s... 
X-Git-Tag: ldb-2.0.5~541
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a23bcc1916a49bf3e0edece190e5434e39862d2c;p=thirdparty%2Fsamba.git

vfs_fruit: use stream code for resource fork size calculation in readdir_attr_rfork_size()

This works as well, using an fstat() on the filehandle to get the size. This is
tested by the torture test "vfs.fruit.SMB2/CREATE context AAPL".

Bug: https://bugzilla.samba.org/show_bug.cgi?id=13968

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 c2833fa3dff..3c6f959fa05 100644
--- a/source3/modules/vfs_fruit.c
+++ b/source3/modules/vfs_fruit.c
@@ -3241,11 +3241,11 @@ static uint64_t readdir_attr_rfork_size(struct vfs_handle_struct *handle,
 
 	switch (config->rsrc) {
 	case FRUIT_RSRC_ADFILE:
-	case FRUIT_RSRC_XATTR:
 		rfork_size = readdir_attr_rfork_size_adouble(handle,
 							     smb_fname);
 		break;
 
+	case FRUIT_RSRC_XATTR:
 	case FRUIT_RSRC_STREAM:
 		rfork_size = readdir_attr_rfork_size_stream(handle,
 							    smb_fname);