netatalk: fix a crash on Solaris when registering with mDNS

[netatalk.git] / etc / afpd / acls.h

diff --git a/etc/afpd/acls.h b/etc/afpd/acls.h
index 273a9f13e1cca3cdd31cfc659e1c4cafba6454ed..4d423af5df73ff715d1f44871e5b3c1a581ada49 100644 (file)
--- a/etc/afpd/acls.h
+++ b/etc/afpd/acls.h
@@ -18,6 +18,9 @@
 #ifdef HAVE_SOLARIS_ACLS
 #include <sys/acl.h>
 #endif
+#ifdef HAVE_FREEBSD_SUNACL
+#include <sunacl.h>
+#endif
 
 #include <atalk/uuid.h>                /* for atalk_uuid_t */
 
@@ -34,10 +37,10 @@
  * the wire! We will ignore and spoil em.
  */
 
-#ifdef HAVE_SOLARIS_ACLS
+#ifdef HAVE_NFSV4_ACLS
 /* Some stuff for the handling of NFSv4 ACLs */
 #define ACE_TRIVIAL (ACE_OWNER | ACE_GROUP | ACE_EVERYONE)
-#endif /* HAVE_SOLARIS_ACLS */
+#endif /* HAVE_NFSV4_ACLS */
 
 /* FPGet|Set Bitmap */
 enum {
@@ -109,10 +112,9 @@ int afp_access (AFPObj *obj, char *ibuf, size_t ibuflen, char *rbuf,  size_t *rb
 int afp_getacl (AFPObj *obj, char *ibuf, size_t ibuflen, char *rbuf,  size_t *rbuflen);
 int afp_setacl (AFPObj *obj, char *ibuf, size_t ibuflen, char *rbuf,  size_t *rbuflen);
 
-/* Parse afp_ldap.conf */
+/* Parse afp.conf */
 extern int acl_ldap_readconfig(char *name);
 
 /* Misc funcs */
-extern int acltoownermode(const struct vol *vol, char *path, struct stat *st, struct maccess *ma);
-extern int check_vol_acl_support(const struct vol *vol);
+extern int acltoownermode(const AFPObj *obj, const struct vol *vol, char *path, struct stat *st, struct maccess *ma);
 #endif