Rev version, fix compilation error when ACL support is not available

diff --git a/NEWS b/NEWS
index 7a34dd579c9d301d37ce5b46bfc6a5090a615e63..1a30f5d9e5044bbbc3726d4eb0124da23ccde9b7 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,8 @@
+Changes in 2.2alpha2
+====================
+
+* FIX: afpd: fix compilation error when ACL support is not available
+
 Changes in 2.2alpha1
 ====================
 

diff --git a/VERSION b/VERSION
index da5d1a49f89ee3ca3c1fae1ebe5949b88e639abe..52d82c119a820c560d78b32046cf707c9aa55c3e 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.2alpha1
\ No newline at end of file
+2.2alpha2
\ No newline at end of file

diff --git a/bin/ad/ad_util.c b/bin/ad/ad_util.c
index 8ed6585748c55e6494416588405194011c21e7c7..58e333e7177cd52cd2420a3f9970332b84710409 100644 (file)
--- a/bin/ad/ad_util.c
+++ b/bin/ad/ad_util.c
@@ -33,7 +33,6 @@
 #endif /* HAVE_CONFIG_H */
 
 #include <sys/types.h>
-#include <sys/acl.h>
 #include <sys/param.h>
 #include <sys/stat.h>
 #include <sys/mman.h>
@@ -49,6 +48,15 @@
 #include <string.h>
 #include <libgen.h>
 
+#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 */
+
 #include <atalk/util.h>
 #include <atalk/cnid.h>
 #include <atalk/volinfo.h>

diff --git a/include/atalk/acl.h b/include/atalk/acl.h
index 706faf22ab0c31f899c59f6d06e6d21e076274d2..53d10b19aa011383c1d8f40788f4984332e70b18 100644 (file)
--- a/include/atalk/acl.h
+++ b/include/atalk/acl.h
@@ -19,6 +19,8 @@
 #include "config.h"
 #endif /* HAVE_CONFIG_H */
 
+#ifdef HAVE_ACLS
+
 #ifdef HAVE_SOLARIS_ACLS
 #include <sys/acl.h>
 #endif  /* HAVE_SOLARIS_ACLS */
@@ -39,4 +41,6 @@ extern int nfsv4_chmod(char *name, mode_t mode);
 
 extern int remove_acl_vfs(const char *name);
 
-#endif  /* ATALK_ACL_H */
+#endif /* HAVE_ACLS */
+
+#endif /* ATALK_ACL_H */

diff --git a/include/atalk/vfs.h b/include/atalk/vfs.h
index be3fefd467a1b8af0cb5ebd502413303acd84d94..0bd5079655c56c0dea583c537bfd1d3da1247070 100644 (file)
--- a/include/atalk/vfs.h
+++ b/include/atalk/vfs.h
@@ -108,9 +108,11 @@ struct vfs_ops {
     int (*vfs_renamefile)    (VFS_FUNC_ARGS_RENAMEFILE);
     int (*vfs_copyfile)      (VFS_FUNC_ARGS_COPYFILE);
 
+#ifdef HAVE_ACLS
     /* ACLs */
     int (*vfs_acl)           (VFS_FUNC_ARGS_ACL);
     int (*vfs_remove_acl)    (VFS_FUNC_ARGS_REMOVE_ACL);
+#endif
 
     /* Extended Attributes */
     int (*vfs_ea_getsize)    (VFS_FUNC_ARGS_EA_GETSIZE);

diff --git a/libatalk/vfs/vfs.c b/libatalk/vfs/vfs.c
index 2431144ce7137112364478f1f29924f2b7640160..3156afe33191433b0ac43cf7db77d1cb4d05e43e 100644 (file)
--- a/libatalk/vfs/vfs.c
+++ b/libatalk/vfs/vfs.c
@@ -960,8 +960,10 @@ VFS_MFUNC(setdirowner, VFS_FUNC_ARGS_SETDIROWNER, VFS_FUNC_VARS_SETDIROWNER)
 VFS_MFUNC(deletefile, VFS_FUNC_ARGS_DELETEFILE, VFS_FUNC_VARS_DELETEFILE)
 VFS_MFUNC(renamefile, VFS_FUNC_ARGS_RENAMEFILE, VFS_FUNC_VARS_RENAMEFILE)
 VFS_MFUNC(copyfile, VFS_FUNC_ARGS_COPYFILE, VFS_FUNC_VARS_COPYFILE)
+#ifdef HAVE_ACLS
 VFS_MFUNC(acl, VFS_FUNC_ARGS_ACL, VFS_FUNC_VARS_ACL)
 VFS_MFUNC(remove_acl, VFS_FUNC_ARGS_REMOVE_ACL, VFS_FUNC_VARS_REMOVE_ACL)
+#endif
 VFS_MFUNC(ea_getsize, VFS_FUNC_ARGS_EA_GETSIZE, VFS_FUNC_VARS_EA_GETSIZE)
 VFS_MFUNC(ea_getcontent, VFS_FUNC_ARGS_EA_GETCONTENT, VFS_FUNC_VARS_EA_GETCONTENT)
 VFS_MFUNC(ea_list, VFS_FUNC_ARGS_EA_LIST, VFS_FUNC_VARS_EA_LIST)
@@ -989,8 +991,10 @@ static struct vfs_ops vfs_master_funcs = {
     vfs_deletefile,
     vfs_renamefile,
     vfs_copyfile,
+#ifdef HAVE_ACLS
     vfs_acl,
     vfs_remove_acl,
+#endif
     vfs_ea_getsize,
     vfs_ea_getcontent,
     vfs_ea_list,
@@ -1064,8 +1068,10 @@ static struct vfs_ops netatalk_ea_adouble = {
     /* vfs_deletefile:    */ ea_deletefile,
     /* vfs_renamefile:    */ ea_renamefile,
     /* vfs_copyfile       */ ea_copyfile,
+#ifdef HAVE_ACLS
     /* vfs_acl:           */ NULL,
     /* vfs_remove_acl     */ NULL,
+#endif
     /* vfs_getsize        */ get_easize,
     /* vfs_getcontent     */ get_eacontent,
     /* vfs_list           */ list_eas,
@@ -1085,8 +1091,10 @@ static struct vfs_ops netatalk_ea_sys = {
     /* rf_deletefile:     */ NULL,
     /* rf_renamefile:     */ NULL,
     /* vfs_copyfile:      */ sys_ea_copyfile,
+#ifdef HAVE_ACLS
     /* rf_acl:            */ NULL,
     /* rf_remove_acl      */ NULL,
+#endif
     /* ea_getsize         */ sys_get_easize,
     /* ea_getcontent      */ sys_get_eacontent,
     /* ea_list            */ sys_list_eas,