[SCM] Samba Shared Repository - branch master updated

[Jeremy Allison]

The branch, master has been updated
       via  28679507219 s3: lib: Fix the solaris build. Commit 8d0ea8bafa00 added SMB_ACL_TYPE_T type to solarisacl_sys_acl_set_fd() in the .c file, but not the .h.
      from  b4c597b6a13 s3: VFS: Update status of SMB_VFS_SYS_ACL_DELETE_DEF_FILE() and SMB_VFS_SYS_ACL_DELETE_DEF_FD().

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


- Log -----------------------------------------------------------------
commit 2867950721993c62a636d754e50d483fda39e19c
Author: Jeremy Allison <jra at samba.org>
Date:   Mon May 17 14:01:43 2021 -0700

    s3: lib: Fix the solaris build. Commit 8d0ea8bafa00 added SMB_ACL_TYPE_T type to solarisacl_sys_acl_set_fd() in the .c file, but not the .h.
    
    The fact no one noticed means currently no one is
    building master on Solaris/Illumos/OmniOS.
    
    Signed-off-by: Jeremy Allison <jra at samba.org>
    Reviewed-by: Ralph Boehme <slow at samba.org>
    
    Autobuild-User(master): Jeremy Allison <jra at samba.org>
    Autobuild-Date(master): Tue May 18 19:23:25 UTC 2021 on sn-devel-184

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

Summary of changes:
 source3/lib/sysacls.c            | 5 ++++-
 source3/modules/vfs_solarisacl.h | 1 +
 2 files changed, 5 insertions(+), 1 deletion(-)


Changeset truncated at 500 lines:

diff --git a/source3/lib/sysacls.c b/source3/lib/sysacls.c
index e41f88b1285..b617bd9df14 100644
--- a/source3/lib/sysacls.c
+++ b/source3/lib/sysacls.c
@@ -456,7 +456,10 @@ int sys_acl_set_file(vfs_handle_struct *handle,
 int sys_acl_set_fd(vfs_handle_struct *handle, files_struct *fsp,
 		   SMB_ACL_T acl_d)
 {
-	return solarisacl_sys_acl_set_fd(handle, fsp, acl_d);
+	return solarisacl_sys_acl_set_fd(handle,
+					fsp,
+					SMB_ACL_TYPE_ACCESS,
+					acl_d);
 }
 
 int sys_acl_delete_def_fd(vfs_handle_struct *handle,
diff --git a/source3/modules/vfs_solarisacl.h b/source3/modules/vfs_solarisacl.h
index 2a9290573e4..a40cbc3fef7 100644
--- a/source3/modules/vfs_solarisacl.h
+++ b/source3/modules/vfs_solarisacl.h
@@ -36,6 +36,7 @@ int solarisacl_sys_acl_set_file(vfs_handle_struct *handle,
 
 int solarisacl_sys_acl_set_fd(vfs_handle_struct *handle,
 			      files_struct *fsp,
+			      SMB_ACL_TYPE_T type,
 			      SMB_ACL_T theacl);
 
 int solarisacl_sys_acl_delete_def_fd(vfs_handle_struct *handle,


-- 
Samba Shared Repository