[SCM] Samba Shared Repository - branch master updated
Andrew Bartlett
abartlet at samba.org
Fri Mar 7 21:54:03 MST 2014
The branch, master has been updated
via 05d01f4 build: Make order of arguments clearer by explicitly making the list of functions to look for a python list
via 11cb110 build: Do not rely on sys.platform for ACL tests, combine UnixWare and Solaris ACL tests
from 3ac9cb3 For FSRVP use textual error messages instead of hex error codes
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 05d01f42246a6a39684d37c42250031e4eea96aa
Author: Andrew Bartlett <abartlet at samba.org>
Date: Fri Mar 7 12:05:19 2014 +1300
build: Make order of arguments clearer by explicitly making the list of functions to look for a python list
Change-Id: I19bbd3b34548258201dabdc0ec8dc049e28d0049
Reviewed-by: David Disseldorp <ddiss at samba.org>
Tested-by: Thomas Schulz <schulz at adi.com>
Signed-off-by: Andrew Bartlett <abartlet at samba.org>
Autobuild-User(master): Andrew Bartlett <abartlet at samba.org>
Autobuild-Date(master): Sat Mar 8 05:53:08 CET 2014 on sn-devel-104
commit 11cb110e2fb3f814aa4efde0d7924535c8510315
Author: Andrew Bartlett <abartlet at samba.org>
Date: Wed Mar 5 15:06:02 2014 +1300
build: Do not rely on sys.platform for ACL tests, combine UnixWare and Solaris ACL tests
This avoids issues with whatever sys.platform may return, fixes the
order of arguments to the CHECK_FUNCS_IN call, and only runs after
Linux-style POSIX ACL detection fails.
Andrew Bartlett
Change-Id: I930dff1e03c1cd1ceb8f3a35823ceb805694b66a
Signed-off-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: David Disseldorp <ddiss at samba.org>
Tested-by: Thomas Schulz <schulz at adi.com>
-----------------------------------------------------------------------
Summary of changes:
source3/lib/sysacls.c | 4 ++--
source3/wscript | 26 +++++++++++---------------
2 files changed, 13 insertions(+), 17 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/lib/sysacls.c b/source3/lib/sysacls.c
index 6e1ac21..2ec3d68 100644
--- a/source3/lib/sysacls.c
+++ b/source3/lib/sysacls.c
@@ -30,7 +30,7 @@
#include "modules/vfs_tru64acl.h"
#endif
-#if defined(HAVE_SOLARIS_ACLS) || defined(HAVE_UNIXWARE_ACLS)
+#if defined(HAVE_SOLARIS_UNIXWARE_ACLS)
#include "modules/vfs_solarisacl.h"
#endif
@@ -457,7 +457,7 @@ int sys_acl_delete_def_file(vfs_handle_struct *handle,
return tru64acl_sys_acl_delete_def_file(handle, path);
}
-#elif defined(HAVE_SOLARIS_ACLS) || defined(HAVE_UNIXWARE_ACLS)
+#elif defined(HAVE_SOLARIS_UNIXWARE_ACLS)
SMB_ACL_T sys_acl_get_file(vfs_handle_struct *handle,
const char *path_p, SMB_ACL_TYPE_T type,
diff --git a/source3/wscript b/source3/wscript
index 45eb33b..17cc17b 100644
--- a/source3/wscript
+++ b/source3/wscript
@@ -398,7 +398,7 @@ utimensat vsyslog _write __write __xstat
conf.DEFINE('FREEBSD', 1)
if conf.CHECK_HEADERS('sunacl.h'):
conf.DEFINE('HAVE_FREEBSD_SUNACL_H', '1')
- conf.CHECK_FUNCS_IN('acl', 'sunacl')
+ conf.CHECK_FUNCS_IN(['acl'], 'sunacl')
conf.DEFINE('STAT_ST_BLOCKSIZE', '512')
elif (host_os.rfind('irix') > -1):
conf.DEFINE('IRIX', 1)
@@ -418,15 +418,7 @@ utimensat vsyslog _write __write __xstat
conf.DEFINE('STAT_ST_BLOCKSIZE', '512')
if Options.options.with_acl_support:
- if (host_os.rfind('sysv5') > -1) and conf.CHECK_FUNCS_IN('sec', 'facl', checklibc=True):
- Logs.info('Using UnixWare ACLs')
- conf.DEFINE('HAVE_UNIXWARE_ACLS',1)
- default_static_modules.extend(TO_LIST('vfs_solarisacl'))
- elif (host_os.rfind('solaris') > -1) and conf.CHECK_FUNCS_IN('sec', 'facl'):
- Logs.info('Using solaris ACLs')
- conf.DEFINE('HAVE_SOLARIS_ACLS',1)
- default_static_modules.extend(TO_LIST('vfs_solarisacl'))
- elif (host_os.rfind('hpux') > -1):
+ if (host_os.rfind('hpux') > -1):
Logs.info('Using HPUX ACLs')
conf.DEFINE('HAVE_HPUX_ACLS',1)
conf.DEFINE('POSIX_ACL_NEEDS_MASK',1)
@@ -435,10 +427,6 @@ utimensat vsyslog _write __write __xstat
Logs.info('Using AIX ACLs')
conf.DEFINE('HAVE_AIX_ACLS',1)
default_static_modules.extend(TO_LIST('vfs_aixacl vfs_aixacl2'))
- elif (host_os.rfind('osf') > -1) and conf.CHECK_FUNCS_IN('pacl', 'acl_get_fd'):
- Logs.info('Using Tru64 ACLs')
- conf.DEFINE('HAVE_TRU64_ACLS',1)
- default_static_modules.extend(TO_LIST('vfs_tru64acl'))
elif (host_os.rfind('darwin') > -1):
Logs.warn('ACLs on Darwin currently not supported')
conf.fatal("ACL support not available on Darwin/MacOS. "
@@ -447,7 +435,7 @@ utimensat vsyslog _write __write __xstat
"ACL support is required to change permissions "
"from Windows clients.")
else:
- conf.CHECK_FUNCS_IN('acl_get_file', 'acl')
+ conf.CHECK_FUNCS_IN(['acl_get_file'], 'acl')
if conf.CHECK_CODE('''
acl_t acl;
int entry_id;
@@ -466,6 +454,14 @@ return acl_get_perm_np(permset_d, perm);
headers='sys/types.h sys/acl.h', link=True,
msg="Checking whether acl_get_perm_np() is available")
default_static_modules.extend(TO_LIST('vfs_posixacl'))
+ 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(TO_LIST('vfs_solarisacl'))
+ elif conf.CHECK_FUNCS_IN(['acl_get_fd'], 'pacl'):
+ Logs.info('Using Tru64 ACLs')
+ conf.DEFINE('HAVE_TRU64_ACLS',1)
+ default_static_modules.extend(TO_LIST('vfs_tru64acl'))
else:
conf.fatal("ACL support not found. Try installing libacl1-dev "
"or libacl-devel. "
--
Samba Shared Repository
More information about the samba-cvs
mailing list