From c78ba30ac4534b7037b979ac96b77b834b2eb2fe Mon Sep 17 00:00:00 2001 From: Ralph Boehme Date: Fri, 17 May 2019 10:43:55 +0200 Subject: [PATCH] vfs_fruit: pass handle to ad_set() On the course of removing ad_handle from struct adouble, step 2. Bug: https://bugzilla.samba.org/show_bug.cgi?id=13968 Signed-off-by: Ralph Boehme Reviewed-by: Jeremy Allison --- source3/modules/vfs_fruit.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/source3/modules/vfs_fruit.c b/source3/modules/vfs_fruit.c index 5f4ae06d845f..f90774334107 100644 --- a/source3/modules/vfs_fruit.c +++ b/source3/modules/vfs_fruit.c @@ -541,7 +541,9 @@ static struct adouble *ad_get(TALLOC_CTX *ctx, vfs_handle_struct *handle, const struct smb_filename *smb_fname, adouble_type_t type); -static int ad_set(struct adouble *ad, const struct smb_filename *smb_fname); +static int ad_set(vfs_handle_struct *handle, + struct adouble *ad, + const struct smb_filename *smb_fname); static int ad_fset(struct vfs_handle_struct *handle, struct adouble *ad, files_struct *fsp); @@ -2032,7 +2034,9 @@ static struct adouble *ad_fget(TALLOC_CTX *ctx, vfs_handle_struct *handle, * * @return status code, 0 means success **/ -static int ad_set(struct adouble *ad, const struct smb_filename *smb_fname) +static int ad_set(vfs_handle_struct *handle, + struct adouble *ad, + const struct smb_filename *smb_fname) { bool ok; int ret; @@ -2050,7 +2054,7 @@ static int ad_set(struct adouble *ad, const struct smb_filename *smb_fname) return -1; } - ret = SMB_VFS_SETXATTR(ad->ad_handle->conn, + ret = SMB_VFS_SETXATTR(handle->conn, smb_fname, AFPINFO_EA_NETATALK, ad->ad_data, @@ -5897,7 +5901,7 @@ static int fruit_ntimes(vfs_handle_struct *handle, ad_setdate(ad, AD_DATE_CREATE | AD_DATE_UNIX, convert_time_t_to_uint32_t(ft->create_time.tv_sec)); - rc = ad_set(ad, smb_fname); + rc = ad_set(handle, ad, smb_fname); exit: -- 2.34.1