Merge branch 'master' into basejobv3

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

diff --git a/bacula/src/filed/acl.h b/bacula/src/filed/acl.h
index 81149cf96bcd2163f7402565fd1eba9beedd6554..fe389734fd4ba18ba7ca457e9f38a54fc1061e8e 100644 (file)
--- a/bacula/src/filed/acl.h
+++ b/bacula/src/filed/acl.h
@@ -29,8 +29,8 @@
  * Properties we use for getting and setting ACLs.
  */
 
-#ifndef _BACULA_ACL_
-#define _BACULA_ACL_
+#ifndef __ACL_H
+#define __ACL_H
 
 /* For shorter ACL strings when possible, define BACL_WANT_SHORT_ACLS */
 /* #define BACL_WANT_SHORT_ACLS */
@@ -67,8 +67,15 @@ typedef enum {
 #define BACL_ENOTSUP          ENOSYS
 #elif defined(HAVE_LINUX_OS) 
 #define BACL_ENOTSUP          ENOTSUP
-#elif defined(HAVE_SUN_OS) 
-#define BACL_ENOTSUP          ENOSYS
 #endif
 
+/*
+ * Internal tracking data.
+ */
+struct acl_data_t {
+   POOLMEM *content;
+   uint32_t content_length;
+   uint32_t nr_errors;
+};
+
 #endif