diff options
| author | Ralph Boehme <slow@samba.org> | 2019-05-17 11:22:24 +0200 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2019-06-21 07:56:18 +0000 |
| commit | b4c6efa3ebd717abab502f9a5891e47750c653e5 (patch) | |
| tree | f195d6cb7e9a82d607b71b2c84db299c61f00d46 | |
| parent | c99c7f2a6411cc2569570361c0b1e45382c6cb04 (diff) | |
| download | samba-b4c6efa3ebd717abab502f9a5891e47750c653e5.tar.gz | |
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 <slow@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
(cherry picked from commit f8df09157f31b53dbe73eaf4349fc071bfcc1b90)
| -rw-r--r-- | source3/modules/vfs_fruit.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/source3/modules/vfs_fruit.c b/source3/modules/vfs_fruit.c index dd17c993803..9b14efe04e4 100644 --- a/source3/modules/vfs_fruit.c +++ b/source3/modules/vfs_fruit.c @@ -1511,7 +1511,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; @@ -1520,7 +1521,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) { @@ -1791,7 +1792,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: |