From: Jeremy Allison Date: Mon, 17 May 2021 21:01:43 +0000 (-0700) Subject: s3: lib: Fix the solaris build. Commit 8d0ea8bafa00 added SMB_ACL_TYPE_T type to... X-Git-Tag: tevent-0.11.0~823 X-Git-Url: http://git.samba.org/?a=commitdiff_plain;h=2867950721993c62a636d754e50d483fda39e19c;p=samba.git 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 Reviewed-by: Ralph Boehme Autobuild-User(master): Jeremy Allison Autobuild-Date(master): Tue May 18 19:23:25 UTC 2021 on sn-devel-184 --- 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,