From 386249eea3a13303744dbab88480e80790138329 Mon Sep 17 00:00:00 2001 From: Ralph Boehme Date: Tue, 10 Oct 2017 16:15:49 +0200 Subject: [PATCH] vfs_fruit: pass smb_fname to ad_convert This will be needed in a later commit when converting xattrs in sidecar AppleDouble files. Bug: https://bugzilla.samba.org/show_bug.cgi?id=13076 Signed-off-by: Ralph Boehme Reviewed-by: Volker Lendecke --- source3/modules/vfs_fruit.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/source3/modules/vfs_fruit.c b/source3/modules/vfs_fruit.c index 973bca85c80..85c77f7164a 100644 --- a/source3/modules/vfs_fruit.c +++ b/source3/modules/vfs_fruit.c @@ -929,7 +929,9 @@ static bool ad_unpack(struct adouble *ad, const size_t nentries, * @return -1 in case an error occurred, 0 if no conversion was done, 1 * otherwise **/ -static int ad_convert(struct adouble *ad, int fd) +static int ad_convert(struct adouble *ad, + const struct smb_filename *smb_fname, + int fd) { int rc = 0; char *map = MAP_FAILED; @@ -1233,7 +1235,7 @@ static ssize_t ad_read_rsrc_adouble(struct adouble *ad, * there is lost. */ - ret = ad_convert(ad, ad->ad_fd); + ret = ad_convert(ad, smb_fname, ad->ad_fd); if (ret != 0) { DBG_WARNING("Failed to convert [%s]\n", smb_fname->base_name); return len; -- 2.11.4.GIT