The branch, v4-14-test has been updated
via 340aff1c8f4 s3: lib: sysacls: Fix argument numbers for
sys_acl_set_fd() for untested OS builds.
via de50dc5c3db configure: Do not put arguments into double quotes
from 4801b6c298b VERSION: Bump version up to 4.14.7...
https://git.samba.org/?p=samba.git;a=shortlog;h=v4-14-test
- Log -----------------------------------------------------------------
commit 340aff1c8f419c5b1ce18fa5f8b080d4426da65f
Author: David Gajewski <dgaj...@math.utoledo.edu>
Date: Mon Aug 2 17:06:39 2021 -0700
s3: lib: sysacls: Fix argument numbers for sys_acl_set_fd() for untested OS
builds.
In the stable release 4.14.6 the prototype for solarisacl_sys_acl_set_fd()
in s3/modules/vfs_solarisacl.h is listed with 3 arguments, while the code
in s3/modules/vfs_solarisacl.c has 4. This leads to a compile error. The
latter reflects the upcoming release, with code in
solarisacl_sys_acl_set_fd()
checking for the type.
The commit was "vfs: add acl type arg to SMB_VFS_SYS_ACL_SET_FD()"
that made the partial change.
A patch mimicking what was done with posixacl_sys_acl_set_fd()
is applied here.
solarisacl_sys_acl_set_fd() is only called from sys_acl_set_fd() in
s3/lib/sysacls.c which in turn is only called by vfswrap_sys_acl_set_fd()
in s3/modules/vfs_default.c when type == SMB_ACL_TYPE_ACCESS.
This patch mimics the call to posixacl_sys_acl_set_fd() by setting
the type argument to SMB_ACL_TYPE_ACCESS for all the affected OS's
that are not tested in ci (tru64 and aix).
BUG: https://bugzilla.samba.org/show_bug.cgi?id=14774
Signed-off-by: David Gajewski <dgaj...@math.utoledo.edu>
Reviewed-by: Jeremy Allison <j...@samba.org>
Reviewed-by: Ralph Boehme <s...@samba.org>
(similar to commit 2867950721993c62a636d754e50d483fda39e19c)
Autobuild-User(v4-14-test): Jule Anger <jan...@samba.org>
Autobuild-Date(v4-14-test): Tue Aug 10 12:41:30 UTC 2021 on sn-devel-184
commit de50dc5c3db243c926b4c10e5355ed47f7b593af
Author: Andreas Schneider <a...@samba.org>
Date: Mon Aug 2 17:43:01 2021 +0200
configure: Do not put arguments into double quotes
BUG: https://bugzilla.samba.org/show_bug.cgi?id=14777
This could create an issue that arguments don't get split by python and
then the
following could happen:
./configure --libdir=/usr/lib64 --enable-clangdb
LIBDIR='/usr/lib64 --enable-clangdb'
This ends then up in parameters.all.xml:
<!ENTITY pathconfig.LIBDIR '/usr/lib64 --enable-clangdb'>
The python parser then errors out:
xml.etree.ElementTree.ParseError: not well-formed (invalid token)
Signed-off-by: Andreas Schneider <a...@samba.org>
Reviewed-by: Andrew Bartlett <abart...@samba.org>
Autobuild-User(master): Andreas Schneider <a...@cryptomilk.org>
Autobuild-Date(master): Tue Aug 3 18:36:37 UTC 2021 on sn-devel-184
(cherry picked from commit e2962b4262fc4a7197a3fcbd010fcfaca781baea)
-----------------------------------------------------------------------
Summary of changes:
configure | 2 +-
source3/lib/sysacls.c | 6 +++---
source3/modules/vfs_solarisacl.h | 1 +
source3/modules/vfs_tru64acl.h | 1 +
4 files changed, 6 insertions(+), 4 deletions(-)
Changeset truncated at 500 lines:
diff --git a/configure b/configure
index a6ca50feb47..2b0ffb0dae1 100755
--- a/configure
+++ b/configure
@@ -13,5 +13,5 @@ export JOBS
unset LD_PRELOAD
cd . || exit 1
-$PYTHON $WAF configure "$@" || exit 1
+$PYTHON $WAF configure $@ || exit 1
cd $PREVPATH
diff --git a/source3/lib/sysacls.c b/source3/lib/sysacls.c
index ad970b6299b..ddf7cad0707 100644
--- a/source3/lib/sysacls.c
+++ b/source3/lib/sysacls.c
@@ -423,7 +423,7 @@ 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 aixacl_sys_acl_set_fd(handle, fsp, acl_d);
+ return aixacl_sys_acl_set_fd(handle, fsp, SMB_ACL_TYPE_ACCESS, acl_d);
}
int sys_acl_delete_def_file(vfs_handle_struct *handle,
@@ -460,7 +460,7 @@ 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 tru64acl_sys_acl_set_fd(handle, fsp, acl_d);
+ return tru64acl_sys_acl_set_fd(handle, fsp, SMB_ACL_TYPE_ACCESS, acl_d);
}
int sys_acl_delete_def_file(vfs_handle_struct *handle,
@@ -498,7 +498,7 @@ 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_file(vfs_handle_struct *handle,
diff --git a/source3/modules/vfs_solarisacl.h b/source3/modules/vfs_solarisacl.h
index ce2206cbe5b..8270358a48d 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_file(vfs_handle_struct *handle,
diff --git a/source3/modules/vfs_tru64acl.h b/source3/modules/vfs_tru64acl.h
index 8dab1f0ec71..5f9078308bf 100644
--- a/source3/modules/vfs_tru64acl.h
+++ b/source3/modules/vfs_tru64acl.h
@@ -34,6 +34,7 @@ int tru64acl_sys_acl_set_file(vfs_handle_struct *handle,
int tru64acl_sys_acl_set_fd(vfs_handle_struct *handle,
files_struct *fsp,
+ SMB_ACL_TYPE_T type,
SMB_ACL_T theacl);
int tru64acl_sys_acl_delete_def_file(vfs_handle_struct *handle,
--
Samba Shared Repository
