Merge branch 'master' into basejobv3

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

diff --git a/bacula/src/filed/filed.h b/bacula/src/filed/filed.h
index 3c3649be307f0c90a952f0af782dfcfdb9367076..b82aef08600ac2b9ab23d29fab8ddde554b34c56 100644 (file)
--- a/bacula/src/filed/filed.h
+++ b/bacula/src/filed/filed.h
@@ -33,6 +33,33 @@
  *   Version $Id$
  */
 
+/*
+ * Number of acl errors to report per job.
+ */
+#define ACL_REPORT_ERR_MAX_PER_JOB     25
+
+/*
+ * Number of xattr errors to report per job.
+ */
+#define XATTR_REPORT_ERR_MAX_PER_JOB   25
+
+/*
+ * Return codes from acl subroutines.
+ */
+typedef enum {
+   bacl_exit_fatal = -1,
+   bacl_exit_error = 0,
+   bacl_exit_ok = 1
+} bacl_exit_code;
+
+/*
+ * Return codes from xattr subroutines.
+ */
+typedef enum {
+   bxattr_exit_fatal = -1,
+   bxattr_exit_error = 0,
+   bxattr_exit_ok = 1
+} bxattr_exit_code;
 
 #define FILE_DAEMON 1
 #include "lib/htable.h"
@@ -40,7 +67,6 @@
 #include "fd_plugins.h"
 #include "findlib/find.h"
 #include "jcr.h"
-#include "acl.h"
 #include "protos.h"                   /* file daemon prototypes */
 #include "lib/runscript.h"
 #include "lib/breg.h"