From: Ralph Boehme <slow@samba.org>
Date: Fri, 17 May 2019 08:43:55 +0000 (+0200)
Subject: vfs_fruit: pass handle to ad_set()
X-Git-Tag: ldb-1.5.5~38
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ab9a428f33589225b1d5e1a00c4ee00202c53cf4;p=thirdparty%2Fsamba.git

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 <slow@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
(cherry picked from commit c78ba30ac4534b7037b979ac96b77b834b2eb2fe)
---

diff --git a/source3/modules/vfs_fruit.c b/source3/modules/vfs_fruit.c
index bef9bac2036..cb87396b9b2 100644
--- a/source3/modules/vfs_fruit.c
+++ b/source3/modules/vfs_fruit.c
@@ -539,7 +539,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);
@@ -2030,7 +2032,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;
@@ -2048,7 +2052,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,
@@ -5874,7 +5878,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: