summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2012-06-01 15:24:20 +1000
committerAndrew Bartlett <abartlet@samba.org>2012-06-02 02:13:49 +0200
commit2716b0a3f3037a5b8ac95b586158ed849c3418c3 (patch)
tree5975ef5e3958120794b6143dd174285e86661358
parente9d797e153ae95561dbb10b56a41281b2472f137 (diff)
downloadsamba-2716b0a3f3037a5b8ac95b586158ed849c3418c3.tar.gz
samba-2716b0a3f3037a5b8ac95b586158ed849c3418c3.tar.bz2
samba-2716b0a3f3037a5b8ac95b586158ed849c3418c3.zip
build: Always attempt to build posix ACLs
These are on more systems than just linux. If the configure test passes then assume it is available. Andrew Bartlett
-rwxr-xr-xsource3/wscript11
1 files changed, 3 insertions, 8 deletions
diff --git a/source3/wscript b/source3/wscript
index bc625a846a..e9d971a3be 100755
--- a/source3/wscript
+++ b/source3/wscript
@@ -305,10 +305,8 @@ utimensat vsyslog _write __write __xstat
#FIXME: add more checks
if Options.options.with_acl_support:
- if host_os.rfind('linux') > -1:
- conf.CHECK_FUNCS_IN('acl_get_file', 'acl')
- conf.CHECK_FUNCS_IN('getxattr', 'attr')
- if conf.CHECK_CODE('''
+ conf.CHECK_FUNCS_IN('acl_get_file', 'acl')
+ if conf.CHECK_CODE('''
acl_t acl;
int entry_id;
acl_entry_t *entry_p;
@@ -317,7 +315,7 @@ return acl_get_entry(acl, entry_id, entry_p);
'HAVE_POSIX_ACLS',
headers='sys/types.h sys/acl.h', link=False,
msg="Checking for POSIX ACL support") :
- conf.CHECK_CODE('''
+ conf.CHECK_CODE('''
acl_permset_t permset_d;
acl_perm_t perm;
return acl_get_perm_np(permset_d, perm);
@@ -325,9 +323,6 @@ return acl_get_perm_np(permset_d, perm);
'HAVE_ACL_GET_PERM_NP',
headers='sys/types.h sys/acl.h', link=True,
msg="Checking whether acl_get_perm_np() is available")
- else:
- conf.DEFINE('HAVE_NO_ACLS', 1)
- conf.SET_TARGET_TYPE('acl', 'EMPTY')
else:
conf.DEFINE('HAVE_NO_ACLS', 1)
conf.SET_TARGET_TYPE('acl', 'EMPTY')