Merge tag 'upstream/3.3.3'

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

diff --git a/server-src/diskfile.h b/server-src/diskfile.h
index 28ed50e8edcba795a9623252d1e49dc26b6b3874..5d744609c82f493ecfffab8b895e274b0f929bb7 100644 (file)
--- a/server-src/diskfile.h
+++ b/server-src/diskfile.h
@@ -1,6 +1,7 @@
 /*
  * Amanda, The Advanced Maryland Automatic Network Disk Archiver
  * Copyright (c) 1991-1998 University of Maryland at College Park
+ * Copyright (c) 2007-2012 Zmanda, Inc.  All Rights Reserved.
  * All Rights Reserved.
  *
  * Permission to use, copy, modify, distribute, and sell this software and its
@@ -79,14 +80,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 +113,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 ? */
@@ -177,8 +179,10 @@ char *xml_dumptype_properties(disk_t *dp);
  */
 void disable_skip_disk(disklist_t *origqp);
 
-char *match_disklist(disklist_t *origqp, int sargc, char **sargv);
-gboolean match_dumpfile(dumpfile_t *file, int sargc, char **sargv);
+char *match_disklist(disklist_t *origqp, gboolean exact_match, int sargc,
+                    char **sargv);
+gboolean match_dumpfile(dumpfile_t *file, gboolean exact_match, int sargc,
+                       char **sargv);
 void free_disklist(disklist_t *dl);
 
 netif_t *disklist_netifs(void);