summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRalph Boehme <slow@samba.org>2019-05-22 18:08:14 +0200
committerKarolin Seeger <kseeger@samba.org>2019-06-21 07:56:19 +0000
commitb24bac64570e9339620dffc0435f0b20dc2f4e6c (patch)
tree3c2f7e60ca40c2c06036ceb3332f6c39485534db
parent561d52f89a6092900a3ac65a40cd1590d8b89c10 (diff)
downloadsamba-b24bac64570e9339620dffc0435f0b20dc2f4e6c.tar.gz
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> (cherry picked from commit a23bcc1916a49bf3e0edece190e5434e39862d2c)
-rw-r--r--source3/modules/vfs_fruit.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source3/modules/vfs_fruit.c b/source3/modules/vfs_fruit.c
index 91839c69576..64bbc2775ba 100644
--- a/source3/modules/vfs_fruit.c
+++ b/source3/modules/vfs_fruit.c
@@ -3218,11 +3218,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);