Imported Upstream version 3.3.3

[debian/amanda] / common-src / amxml.h

diff --git a/common-src/amxml.h b/common-src/amxml.h
index 2f64b62426dbab646464c8fa3b9340ac892ff35f..04d45ed25195d7b1edd798c4943864e63debc7d1 100644 (file)
--- a/common-src/amxml.h
+++ b/common-src/amxml.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
@@ -40,6 +41,7 @@ typedef struct script_s {
     execute_on_t                   execute_on;
     int                            execute_where;
     proplist_t                     property;
+    char                          *client_name;
     struct client_script_result_s *result;
 } script_t;
 
@@ -48,8 +50,8 @@ typedef GSList *scriptlist_t;
 typedef struct level_s {
     int level;
     int server;                        /* if server can do the estimate */
-} level_t;
-typedef GSList *levellist_t;   /* A list where each element is a (level_t *) */
+} am_level_t;
+typedef GSList *levellist_t;   /* A list where each element is a (am_level_t *) */
 
 typedef struct a_dle_s {
     char   *disk;
@@ -72,13 +74,15 @@ typedef struct a_dle_s {
     int     record;
     int     create_index;
     char   *auth;
-    sl_t   *exclude_file;
-    sl_t   *exclude_list;
-    sl_t   *include_file;
-    sl_t   *include_list;
+    am_sl_t   *exclude_file;
+    am_sl_t   *exclude_list;
+    am_sl_t   *include_file;
+    am_sl_t   *include_list;
     int     exclude_optional;
     int     include_optional;
+    proplist_t property;
     proplist_t application_property;
+    char        *application_client_name;
     scriptlist_t scriptlist;
     data_path_t  data_path;
     GSList      *directtcp_list;