Merge Preben's patch for ACLs and for Mac OS X resource forks.

[bacula/bacula] / bacula / src / filed / acl.h

diff --git a/bacula/src/filed/acl.h b/bacula/src/filed/acl.h
index 44b46c0c0a7cb1fc042fde9d238313c28afa0505..2d5676f24d3af7f885e12268254d4610f9ec93b0 100644 (file)
--- a/bacula/src/filed/acl.h
+++ b/bacula/src/filed/acl.h
@@ -5,10 +5,10 @@
 #ifndef _BACULA_ACL_
 #define _BACULA_ACL_
 
-/* If you want shorter ACL strings when possible, uncomment this */
-#define BACL_WANT_SHORT_ACLS
+/* For shorter ACL strings when possible, define BACL_WANT_SHORT_ACLS */
+/* #define BACL_WANT_SHORT_ACLS */
 
-/* If you want numeric user/group ids when possible, uncomment this */
+/* For numeric user/group ids when possible, define BACL_WANT_NUMERIC_IDS */
 /* #define BACL_WANT_NUMERIC_IDS */
 
 /* We support the following types of ACLs */
@@ -20,16 +20,27 @@
 #define BACL_CAP_DEFAULTS     0x001    /* Has default ACLs for directories */
 #define BACL_CAP_DEFAULTS_DIR 0x002    /* Default ACLs must be read separately */
 
-/* Set capabilities for various OS */
-#if defined(HAVE_SUN_OS)
-#define BACL_CAP             BACL_CAP_DEFAULTS
-#elif defined(HAVE_FREEBSD_OS) \
-   || defined(HAVE_IRIX_OS) \
-   || defined(HAVE_OSF1_OS) \
-   || defined(HAVE_LINUX_OS)
+/* Set BACL_CAP (always) and BACL_ENOTSUP (when used) for various OS */
+#if defined(HAVE_FREEBSD_OS)
 #define BACL_CAP             (BACL_CAP_DEFAULTS|BACL_CAP_DEFAULTS_DIR)
-#else
+#define BACL_ENOTSUP         EOPNOTSUPP
+#elif defined(HAVE_HPUX_OS)
 #define BACL_CAP             BACL_CAP_NONE
+#define BACL_ENOTSUP         EOPNOTSUPP
+#elif defined(HAVE_IRIX_OS)
+#define BACL_CAP             (BACL_CAP_DEFAULTS|BACL_CAP_DEFAULTS_DIR)
+#define BACL_ENOTSUP         ENOSYS
+#elif defined(HAVE_LINUX_OS) 
+#define BACL_CAP             (BACL_CAP_DEFAULTS|BACL_CAP_DEFAULTS_DIR)
+#define BACL_ENOTSUP         ENOTSUP
+#elif defined(HAVE_OSF1_OS)
+#define BACL_CAP             (BACL_CAP_DEFAULTS|BACL_CAP_DEFAULTS_DIR)
+/* #define BACL_ENOTSUP              ENOTSUP */     /* Don't know */
+#define BACL_CAP             (BACL_CAP_DEFAULTS|BACL_CAP_DEFAULTS_DIR)
+#elif defined(HAVE_SUN_OS)
+#define BACL_CAP             BACL_CAP_DEFAULTS
+#else
+#define BACL_CAP             BACL_CAP_NONE  /* nothing special */
 #endif
 
 #endif