diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2014-03-05 15:06:02 +1300 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2014-03-08 03:54:08 +0100 |
| commit | 11cb110e2fb3f814aa4efde0d7924535c8510315 (patch) | |
| tree | d6b6257124bf84d13cd67aeb19304cde5fd513b5 /source3/lib/sysacls.c | |
| parent | 3ac9cb3d17c5252383e8f971818a426c6ad68c2d (diff) | |
| download | samba-11cb110e2fb3f814aa4efde0d7924535c8510315.tar.gz samba-11cb110e2fb3f814aa4efde0d7924535c8510315.tar.xz samba-11cb110e2fb3f814aa4efde0d7924535c8510315.zip | |
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@samba.org>
Reviewed-by: David Disseldorp <ddiss@samba.org>
Tested-by: Thomas Schulz <schulz@adi.com>
Diffstat (limited to 'source3/lib/sysacls.c')
| -rw-r--r-- | source3/lib/sysacls.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source3/lib/sysacls.c b/source3/lib/sysacls.c index 6e1ac21a1ea..2ec3d68a85b 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, |