Merge from branch-2-1

[netatalk.git] / include / atalk / acl.h

diff --git a/include/atalk/acl.h b/include/atalk/acl.h
index 6b48e5522c1e365a187fb081f2275a81c2704c3d..53d10b19aa011383c1d8f40788f4984332e70b18 100644 (file)
--- a/include/atalk/acl.h
+++ b/include/atalk/acl.h
@@ -19,14 +19,28 @@
 #include "config.h"
 #endif /* HAVE_CONFIG_H */
 
+#ifdef HAVE_ACLS
+
 #ifdef HAVE_SOLARIS_ACLS
 #include <sys/acl.h>
 #endif  /* HAVE_SOLARIS_ACLS */
 
+#ifdef HAVE_POSIX_ACLS
+#include <sys/types.h>
+#include <sys/acl.h>
+#endif /* HAVE_POSIX_ACLS */
+
 #ifdef HAVE_SOLARIS_ACLS
+#define chmod nfsv4_chmod
 extern int get_nfsv4_acl(const char *name, ace_t **retAces);
+extern int strip_trivial_aces(ace_t **saces, int sacecount);
+extern int strip_nontrivial_aces(ace_t **saces, int sacecount);
+extern ace_t *concat_aces(ace_t *aces1, int ace1count, ace_t *aces2, int ace2count);
+extern int nfsv4_chmod(char *name, mode_t mode);
 #endif /* HAVE_SOLARIS_ACLS */
 
 extern int remove_acl_vfs(const char *name);
 
-#endif  /* ATALK_ACL_H */
+#endif /* HAVE_ACLS */
+
+#endif /* ATALK_ACL_H */