Merge tag 'upstream/3.3.2'

[debian/amanda] / server-src / diskfile.h

diff --git a/server-src/diskfile.h b/server-src/diskfile.h
index 28ed50e8edcba795a9623252d1e49dc26b6b3874..c2d7d073a8b71660a01d2d7f0dda47f9ae714ce2 100644 (file)
--- a/server-src/diskfile.h
+++ b/server-src/diskfile.h
@@ -79,14 +79,15 @@ typedef struct disk_s {
     char       *client_username;       /* username to connect on the client */
     char       *client_port;           /* port to connect on the client */
     char       *ssh_keys;              /* ssh_key file to use */
-    sl_t       *exclude_file;          /* file exclude spec */
-    sl_t       *exclude_list;          /* exclude list */
-    sl_t       *include_file;          /* file include spec */
-    sl_t       *include_list;          /* include list */
+    am_sl_t    *exclude_file;          /* file exclude spec */
+    am_sl_t    *exclude_list;          /* exclude list */
+    am_sl_t    *include_file;          /* file include spec */
+    am_sl_t    *include_list;          /* include list */
     int                exclude_optional;       /* exclude list are optional */
     int                include_optional;       /* include list are optional */
     int                priority;               /* priority of disk */
     int                allow_split;
+    int         max_warnings;
     off_t      splitsize;
     off_t      tape_splitsize;         /* size of dumpfile chunks on tape */
     char       *split_diskbuffer;      /* place where we can buffer PORT-WRITE dumps other than RAM */
@@ -111,7 +112,7 @@ typedef struct disk_s {
     char       *clnt_decrypt_opt;      /* client-side decryption option parameter to use */
     double     comprate[2];            /* default compression rates */
     /* flag options */
-    int                record;                 /* record dump in /etc/dumpdates ? */
+    int                record;                 /* record dump in /var/lib/dumpdates ? */
     int                skip_incr;              /* incs done externally ? */
     int                skip_full;              /* fulls done externally ? */
     int                to_holdingdisk;         /* use holding disk ? */