Reverted the change of TRU64 to OSF1 for the OS detection rules. Although Compaq...

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

diff --git a/bacula/src/filed/filed.h b/bacula/src/filed/filed.h
index 19591c8a410296ed5a5336d99b277209b07438a6..f6c785f59695bd9c15422480433bc9f42de0f622 100644 (file)
--- a/bacula/src/filed/filed.h
+++ b/bacula/src/filed/filed.h
@@ -1,12 +1,12 @@
 /*
    Bacula® - The Network Backup Solution
 
 /*
    Bacula® - The Network Backup Solution
 

-   Copyright (C) 2001-2008 Free Software Foundation Europe e.V.
+   Copyright (C) 2001-2010 Free Software Foundation Europe e.V.

 
    The main author of Bacula is Kern Sibbald, with contributions from
    many others, a complete list can be found in the file AUTHORS.
    This program is Free Software; you can redistribute it and/or
 
    The main author of Bacula is Kern Sibbald, with contributions from
    many others, a complete list can be found in the file AUTHORS.
    This program is Free Software; you can redistribute it and/or

-   modify it under the terms of version two of the GNU General Public
+   modify it under the terms of version three of the GNU Affero General Public

    License as published by the Free Software Foundation and included
    in the file LICENSE.
 
    License as published by the Free Software Foundation and included
    in the file LICENSE.
 


@@ -15,7 +15,7 @@
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
    General Public License for more details.
 
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
    General Public License for more details.
 

-   You should have received a copy of the GNU General Public License
+   You should have received a copy of the GNU Affero General Public License

    along with this program; if not, write to the Free Software
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
    along with this program; if not, write to the Free Software
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.


@@ -30,15 +30,43 @@
  *
  *     Kern Sibbald, Jan MMI
  *
  *
  *     Kern Sibbald, Jan MMI
  *

- *   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"
 #include "filed_conf.h"
 #include "fd_plugins.h"
 #include "findlib/find.h"
 
 #define FILE_DAEMON 1
 #include "lib/htable.h"
 #include "filed_conf.h"
 #include "fd_plugins.h"
 #include "findlib/find.h"

+#include "acl.h"
+#include "xattr.h"

 #include "jcr.h"
 #include "protos.h"                   /* file daemon prototypes */
 #include "lib/runscript.h"
 #include "jcr.h"
 #include "protos.h"                   /* file daemon prototypes */
 #include "lib/runscript.h"


@@ -51,7 +79,5 @@
 
 extern CLIENT *me;                    /* "Global" Client resource */
 
 
 extern CLIENT *me;                    /* "Global" Client resource */
 

-/*
- * Number of acl errors to report per job.
- */
-#define ACL_REPORT_ERR_MAX_PER_JOB     25
+void terminate_filed(int sig);
+