From: Ralph Boehme <slow@samba.org>
Date: Fri, 17 May 2019 10:05:07 +0000 (+0200)
Subject: vfs_fruit: pass handle to ad_convert_finderinfo()
X-Git-Tag: ldb-2.0.5~548
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=50874c1548d62ab0ddaaa6dd4124279ee5029fcf;p=thirdparty%2Fsamba.git

vfs_fruit: pass handle to ad_convert_finderinfo()

On the course of removing ad_handle from struct adouble, step 9.

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>
---

diff --git a/source3/modules/vfs_fruit.c b/source3/modules/vfs_fruit.c
index 8cc3edbaecb..1cfb194ccea 100644
--- a/source3/modules/vfs_fruit.c
+++ b/source3/modules/vfs_fruit.c
@@ -1227,7 +1227,8 @@ fail:
 	return ok;
 }
 
-static bool ad_convert_finderinfo(struct adouble *ad,
+static bool ad_convert_finderinfo(vfs_handle_struct *handle,
+				  struct adouble *ad,
 				  const struct smb_filename *smb_fname)
 {
 	char *p_ad = NULL;
@@ -1284,7 +1285,7 @@ static bool ad_convert_finderinfo(struct adouble *ad,
 	DBG_DEBUG("stream_name: %s\n", smb_fname_str_dbg(stream_name));
 
 	status = SMB_VFS_CREATE_FILE(
-		ad->ad_handle->conn,		/* conn */
+		handle->conn,			/* conn */
 		NULL,				/* req */
 		0,				/* root_dir_fid */
 		stream_name,			/* fname */
@@ -1492,7 +1493,7 @@ static int ad_convert(struct vfs_handle_struct *handle,
 		}
 	}
 
-	ok = ad_convert_finderinfo(ad, smb_fname);
+	ok = ad_convert_finderinfo(handle, ad, smb_fname);
 	if (!ok) {
 		DBG_ERR("Failed to convert [%s]\n",
 			smb_fname_str_dbg(smb_fname));