summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2007-03-22 17:35:34 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:18:49 -0500
commitc542e154c2e4300d6d6b1c6ed5d5bd651d7aa5f9 (patch)
tree7df1390b6635b40b1c9d3539e6326be025ec0cb9
parent820184bdcc6899b1c448ba5d82095a3ce3eeb47c (diff)
downloadsamba-c542e154c2e4300d6d6b1c6ed5d5bd651d7aa5f9.tar.gz
samba-c542e154c2e4300d6d6b1c6ed5d5bd651d7aa5f9.tar.bz2
samba-c542e154c2e4300d6d6b1c6ed5d5bd651d7aa5f9.zip
r21931: include acl/libacl.h is present
I'm not sure if this should go into 3.0.25... it fixes a compiler warning about a missing acl_get_perm() prototype metze (This used to be commit 4b67f94c6a148d6fecaa90d66ce6893b5feb370a)
-rw-r--r--source3/configure.in3
-rw-r--r--source3/lib/replace/system/filesys.h4
2 files changed, 6 insertions, 1 deletions
diff --git a/source3/configure.in b/source3/configure.in
index 0b2f8bd905..2f6933b6b6 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -918,7 +918,8 @@ AC_CHECK_HEADERS(shadow.h)
AC_CHECK_HEADERS(nss.h nss_common.h nsswitch.h ns_api.h sys/security.h)
AC_CHECK_HEADERS(syscall.h sys/syscall.h)
-AC_CHECK_HEADERS(sys/acl.h sys/attributes.h attr/xattr.h sys/xattr.h sys/extattr.h sys/uio.h)
+AC_CHECK_HEADERS(sys/acl.h acl/libacl.h)
+AC_CHECK_HEADERS(sys/attributes.h attr/xattr.h sys/xattr.h sys/extattr.h sys/uio.h)
AC_CHECK_HEADERS(sys/ea.h sys/proplist.h)
AC_CHECK_HEADERS(sys/cdefs.h glob.h)
diff --git a/source3/lib/replace/system/filesys.h b/source3/lib/replace/system/filesys.h
index 1e48f7ab40..ae36d17a0a 100644
--- a/source3/lib/replace/system/filesys.h
+++ b/source3/lib/replace/system/filesys.h
@@ -41,6 +41,10 @@
#include <sys/acl.h>
#endif
+#ifdef HAVE_SYS_ACL_H
+#include <acl/libacl.h>
+#endif
+
#ifdef HAVE_SYS_FS_S5PARAM_H
#include <sys/fs/s5param.h>
#endif