X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=include%2Fatalk%2Facl.h;h=c7343a9e735f37878cc0b6e89dbc43fc258b4b4b;hb=3a84db87064922ad10ac10cc1d6833380e575995;hp=53d10b19aa011383c1d8f40788f4984332e70b18;hpb=99080678c43ac3ebf2076598884a3e472697fe6b;p=netatalk.git

diff --git a/include/atalk/acl.h b/include/atalk/acl.h
index 53d10b19..c7343a9e 100644
--- a/include/atalk/acl.h
+++ b/include/atalk/acl.h
@@ -21,26 +21,48 @@
 
 #ifdef HAVE_ACLS
 
+#define O_NETATALK_ACL (O_NOFOLLOW << 1)
+#define O_IGNORE (O_NOFOLLOW << 2)
+
 #ifdef HAVE_SOLARIS_ACLS
 #include <sys/acl.h>
-#endif  /* HAVE_SOLARIS_ACLS */
+#endif
+#ifdef HAVE_FREEBSD_SUNACL
+#include <sunacl.h>
+#endif
 
-#ifdef HAVE_POSIX_ACLS
-#include <sys/types.h>
-#include <sys/acl.h>
-#endif /* HAVE_POSIX_ACLS */
+#ifdef HAVE_NFSV4_ACLS
+
+#define chmod_acl nfsv4_chmod
 
-#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 */
+
+#endif  /* HAVE_NFSV4_ACLS */
+
+#ifdef HAVE_POSIX_ACLS
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <sys/acl.h>
+
+#define chmod_acl posix_chmod
+#define fchmod_acl posix_fchmod
+
+extern int posix_chmod(const char *name, mode_t mode);
+extern int posix_fchmod(int fd, mode_t mode);
+
+#endif /* HAVE_POSIX_ACLS */
 
 extern int remove_acl_vfs(const char *name);
 
+#else /* HAVE_ACLS=no */
+
+#define O_NETATALK_ACL 0
+#define chmod_acl chmod
+
 #endif /* HAVE_ACLS */
 
 #endif /* ATALK_ACL_H */