From: Ralph Boehme Date: Fri, 17 May 2019 09:22:24 +0000 (+0200) Subject: vfs_fruit: pass handle to ad_read_meta() X-Git-Tag: ldb-2.0.5~555 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f8df09157f31b53dbe73eaf4349fc071bfcc1b90;p=thirdparty%2Fsamba.git vfs_fruit: pass handle to ad_read_meta() On the course of removing ad_handle from struct adouble, step 4. Bug: https://bugzilla.samba.org/show_bug.cgi?id=13968 Signed-off-by: Ralph Boehme Reviewed-by: Jeremy Allison --- diff --git a/source3/modules/vfs_fruit.c b/source3/modules/vfs_fruit.c index 82b1532dac2..eabdcc30c4d 100644 --- a/source3/modules/vfs_fruit.c +++ b/source3/modules/vfs_fruit.c @@ -1513,7 +1513,8 @@ done: /** * Read and parse Netatalk AppleDouble metadata xattr **/ -static ssize_t ad_read_meta(struct adouble *ad, +static ssize_t ad_read_meta(vfs_handle_struct *handle, + struct adouble *ad, const struct smb_filename *smb_fname) { int rc = 0; @@ -1522,7 +1523,7 @@ static ssize_t ad_read_meta(struct adouble *ad, DEBUG(10, ("reading meta xattr for %s\n", smb_fname->base_name)); - ealen = SMB_VFS_GETXATTR(ad->ad_handle->conn, smb_fname, + ealen = SMB_VFS_GETXATTR(handle->conn, smb_fname, AFPINFO_EA_NETATALK, ad->ad_data, AD_DATASZ_XATTR); if (ealen == -1) { @@ -1793,7 +1794,7 @@ static ssize_t ad_read(vfs_handle_struct *handle, { switch (ad->ad_type) { case ADOUBLE_META: - return ad_read_meta(ad, smb_fname); + return ad_read_meta(handle, ad, smb_fname); case ADOUBLE_RSRC: return ad_read_rsrc(ad, smb_fname); default: