Tweak fix MySQL quoting again :-(

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

diff --git a/bacula/src/filed/acl.h b/bacula/src/filed/acl.h
index b716c69229175658ec0cd05b7f4675bcc596aae9..41a21c14531b65a5750f5036c320b75285fc9187 100644 (file)
--- a/bacula/src/filed/acl.h
+++ b/bacula/src/filed/acl.h
@@ -1,15 +1,12 @@
-/*
- * Properties we use for getting and setting ACLs.
- */
 /*
    Bacula® - The Network Backup Solution
 
-   Copyright (C) 2004-2006 Free Software Foundation Europe e.V.
+   Copyright (C) 2004-2008 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
-   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.
 
@@ -18,19 +15,22 @@
    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.
 
-   Bacula® is a registered trademark of John Walker.
+   Bacula® is a registered trademark of Kern Sibbald.
    The licensor of Bacula is the Free Software Foundation Europe
    (FSFE), Fiduciary Program, Sumatrastrasse 25, 8006 Zürich,
    Switzerland, email:ftf@fsfeurope.org.
 */
+/*
+ * 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 */
@@ -38,39 +38,49 @@
 /* For numeric user/group ids when possible, define BACL_WANT_NUMERIC_IDS */
 /* #define BACL_WANT_NUMERIC_IDS */
 
-/* We support the following types of ACLs */
-#define BACL_TYPE_NONE        0x000
-#define BACL_TYPE_ACCESS      0x001
-#define BACL_TYPE_DEFAULT     0x002
+/*
+ * We support the following types of ACLs
+ */
+typedef enum {
+   BACL_TYPE_NONE = 0,
+   BACL_TYPE_ACCESS = 1,
+   BACL_TYPE_DEFAULT = 2,
+   BACL_TYPE_DEFAULT_DIR = 3,
+   BACL_TYPE_EXTENDED = 4
+} bacl_type;
 
-#define BACL_CAP_NONE         0x000    /* No special capabilities */
-#define BACL_CAP_DEFAULTS     0x001    /* Has default ACLs for directories */
-#define BACL_CAP_DEFAULTS_DIR 0x002    /* Default ACLs must be read separately */
+/*
+ * This value is used as ostype when we encounter an invalid acl type.
+ * The way the code is build this should never happen.
+ */
+#if !defined(ACL_TYPE_NONE)
+#define ACL_TYPE_NONE 0x0
+#endif
 
-/* 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)
 #define BACL_ENOTSUP          EOPNOTSUPP
 #elif defined(HAVE_DARWIN_OS)
-#define BACL_CAP              BACL_CAP_NONE
 #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
 
+#define BACL_FLAG_SAVE_NATIVE  0x01
+#define BACL_FLAG_SAVE_AFS     0x02
+
+/*
+ * Internal tracking data.
+ */
+struct acl_data_t {
+   POOLMEM *content;
+   uint32_t content_length;
+   uint32_t nr_errors;
+   uint32_t current_dev;
+   uint32_t flags;             /* See BACL_FLAG_* */
+};
+
 #endif