Attachment 17171 Details for Bug 14974 – backported patch for 4.15 and 4.16

[patch] backported patch for 4.15 and 4.16

bug14974.patch (text/plain), 3.42 KB, created by Björn Jacke on 2022-02-19 22:33:42 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Björn Jacke

Created: 2022-02-19 22:33:42 UTC

Size: 3.42 KB

patch

obsolete

>From 139a65f2bd3ed87ac2c2be51eb6a2e34d9cb13ff Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Bj=C3=B6rn=20Jacke?= <bj@sernet.de>
>Date: Fri, 11 Feb 2022 03:38:31 +0100
>Subject: [PATCH 1/2] acl: fix function arguments for AIX' and Solaris'
> sys_acl_get_fd()
>
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=14974
>
>Signed-off-by: Bjoern Jacke <bjacke@samba.org>
>Reviewed-by: Jeremy Allison <jra@samba.org>
>(cherry picked from commit 183ab5ced8377b63ad07d2e810396d3b414f4a7d)
>---
> source3/lib/sysacls.c            | 2 +-
> source3/modules/vfs_solarisacl.h | 1 +
> 2 files changed, 2 insertions(+), 1 deletion(-)
>
>diff --git a/source3/lib/sysacls.c b/source3/lib/sysacls.c
>index e287bb5d488..a7ab5836536 100644
>--- a/source3/lib/sysacls.c
>+++ b/source3/lib/sysacls.c
>@@ -414,7 +414,7 @@ SMB_ACL_T sys_acl_get_fd(vfs_handle_struct *handle,
> 			 SMB_ACL_TYPE_T type,
> 			 TALLOC_CTX *mem_ctx)
> {
>-	return solarisacl_sys_acl_get_fd(handle, fsp,
>+	return solarisacl_sys_acl_get_fd(handle, fsp, type,
> 					 mem_ctx);
> }
> 
>diff --git a/source3/modules/vfs_solarisacl.h b/source3/modules/vfs_solarisacl.h
>index f914304fd24..54d538c25a8 100644
>--- a/source3/modules/vfs_solarisacl.h
>+++ b/source3/modules/vfs_solarisacl.h
>@@ -27,6 +27,7 @@ SMB_ACL_T solarisacl_sys_acl_get_file(vfs_handle_struct *handle,
> 
> SMB_ACL_T solarisacl_sys_acl_get_fd(vfs_handle_struct *handle,
> 				    files_struct *fsp, 
>+				    SMB_ACL_TYPE_T type,
> 				    TALLOC_CTX *mem_ctx);
> 
> int solarisacl_sys_acl_set_fd(vfs_handle_struct *handle,
>-- 
>2.20.2
>
>
>From 3d931a784d53a606b05e8b709a1fba0f93bc5752 Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Bj=C3=B6rn=20Jacke?= <bj@sernet.de>
>Date: Tue, 15 Feb 2022 14:25:41 +0100
>Subject: [PATCH 2/2] wscript: s/default/required/ _static_modules for the acl
> modules
>
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=14974
>
>Signed-off-by: Bjoern Jacke <bjacke@samba.org>
>Reviewed-by: Jeremy Allison <jra@samba.org>
>(cherry picked from commit 89e903985b6968c5becc69b757b23144b1aba66e)
>---
> source3/wscript | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
>diff --git a/source3/wscript b/source3/wscript
>index 18279037a5f..17b0d939622 100644
>--- a/source3/wscript
>+++ b/source3/wscript
>@@ -500,11 +500,11 @@ vsyslog
>                 Logs.info('Using HPUX ACLs')
>                 conf.DEFINE('HAVE_HPUX_ACLS',1)
>                 conf.DEFINE('POSIX_ACL_NEEDS_MASK',1)
>-                default_static_modules.extend(['vfs_hpuxacl'])
>+                required_static_modules.extend(['vfs_hpuxacl'])
>         elif (host_os.rfind('aix') > -1):
>                 Logs.info('Using AIX ACLs')
>                 conf.DEFINE('HAVE_AIX_ACLS',1)
>-                default_static_modules.extend(['vfs_aixacl', 'vfs_aixacl2'])
>+                required_static_modules.extend(['vfs_aixacl', 'vfs_aixacl2'])
>         elif (host_os.rfind('darwin') > -1):
>             Logs.warn('ACLs on Darwin currently not supported')
>             conf.fatal("ACL support not available on Darwin/MacOS. "
>@@ -537,7 +537,7 @@ return acl_get_perm_np(permset_d, perm);
>             elif conf.CHECK_FUNCS_IN(['facl'], 'sec'):
>                 Logs.info('Using solaris or UnixWare ACLs')
>                 conf.DEFINE('HAVE_SOLARIS_UNIXWARE_ACLS',1)
>-                default_static_modules.extend(['vfs_solarisacl'])
>+                required_static_modules.extend(['vfs_solarisacl'])
>             else:
>                 conf.fatal("ACL support not found. Try installing libacl1-dev "
>                            "or libacl-devel.  "
>-- 
>2.20.2
>

Flags:

metze: review+

Actions: View

Attachments on bug 14974: 17171