[SCM] Samba Shared Repository - branch master updated

[Volker Lendecke]

The branch, master has been updated
       via  da3b00f5511 vfs: Fix the FreeBSD build
       via  d0260cb8347 vfs: Remove an unused variable from zfs_get_nt_acl_common()
      from  29503c5b99c lib: Fix the build on FreeBSD

https://git.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit da3b00f5511d83bdc347eaff9c031390fea41802
Author: Volker Lendecke <vl at samba.org>
Date:   Mon Jan 25 09:55:40 2021 +0100

    vfs: Fix the FreeBSD build
    
    fd_handle is private now
    
    Signed-off-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Ralph Boehme <slow at samba.org>
    
    Autobuild-User(master): Volker Lendecke <vl at samba.org>
    Autobuild-Date(master): Mon Jan 25 12:16:11 UTC 2021 on sn-devel-184

commit d0260cb8347455c0ebddcbccbac7fea732a5c44b
Author: Volker Lendecke <vl at samba.org>
Date:   Mon Jan 25 09:55:08 2021 +0100

    vfs: Remove an unused variable from zfs_get_nt_acl_common()
    
    Signed-off-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Ralph Boehme <slow at samba.org>

-----------------------------------------------------------------------

Summary of changes:
 source3/modules/vfs_zfsacl.c | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/modules/vfs_zfsacl.c b/source3/modules/vfs_zfsacl.c
index a526ffa19aa..467a0031119 100644
--- a/source3/modules/vfs_zfsacl.c
+++ b/source3/modules/vfs_zfsacl.c
@@ -58,7 +58,6 @@ static NTSTATUS zfs_get_nt_acl_common(struct connection_struct *conn,
 	int i;
 	struct SMB4ACL_T *pacl;
 	SMB_STRUCT_STAT sbuf;
-	SMB_ACE4PROP_T blocking_ace;
 	const SMB_STRUCT_STAT *psbuf = NULL;
 	int ret;
 	bool inherited_is_present = false;
@@ -169,6 +168,7 @@ static bool zfs_process_smbacl(vfs_handle_struct *handle, files_struct *fsp,
 	bool have_special_id = false;
 	bool must_add_empty_ace = false;
 	struct zfsacl_config_data *config = NULL;
+	int fd;
 
 	SMB_VFS_HANDLE_GET_DATA(handle, config,
 				struct zfsacl_config_data,
@@ -235,8 +235,9 @@ static bool zfs_process_smbacl(vfs_handle_struct *handle, files_struct *fsp,
 	SMB_ASSERT(i == naces);
 
 	/* store acl */
-	if (fsp->fh->fd != -1) {
-		rv = facl(fsp->fh->fd, ACE_SETACL, naces, acebuf);
+	fd = fsp_get_io_fd(fsp);
+	if (fd != -1) {
+		rv = facl(fd, ACE_SETACL, naces, acebuf);
 	}
 	else {
 		rv = acl(fsp->fsp_name->base_name, ACE_SETACL, naces, acebuf);
@@ -319,12 +320,14 @@ static int fget_zfsacl(TALLOC_CTX *mem_ctx,
 {
 	int naces, rv;
 	ace_t *acebuf = NULL;
+	int fd;
 
-	if (fsp->fh->fd == -1) {
+	fd = fsp_get_io_fd(fsp);
+	if (fd == -1) {
 		return get_zfsacl(mem_ctx, fsp->fsp_name, outbuf);
 	}
 
-	naces = facl(fsp->fh->fd, ACE_GETACLCNT, 0, NULL);
+	naces = facl(fd, ACE_GETACLCNT, 0, NULL);
 	if (naces == -1) {
 		int dbg_level = 10;
 
@@ -342,7 +345,7 @@ static int fget_zfsacl(TALLOC_CTX *mem_ctx,
 		return -1;
 	}
 
-	rv = facl(fsp->fh->fd, ACE_GETACL, naces, acebuf);
+	rv = facl(fd, ACE_GETACL, naces, acebuf);
 	if (rv == -1) {
 		DBG_DEBUG("acl(ACE_GETACL, %s): %s ",
 			  fsp_str_dbg(fsp), strerror(errno));


-- 
Samba Shared Repository