Merge tag 'upstream/3.3.1'

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

diff --git a/server-src/diskfile.h b/server-src/diskfile.h
index aa485a5975f85745a5e05c15709524b6649296e9..9fae30e2a5237cb084e6e2931018754e16eda0c6 100644 (file)
--- a/server-src/diskfile.h
+++ b/server-src/diskfile.h
@@ -59,6 +59,7 @@ typedef struct amhost_s {
 
 typedef struct disk_s {
     int                line;                   /* line number of last definition */
+    char       *filename;               /* the filename where it is read */
     struct disk_s *prev, *next;                /* doubly linked disk list */
 
     am_host_t  *host;                  /* host list */
@@ -163,10 +164,11 @@ char *optionstr(disk_t *dp);
 GPtrArray *validate_optionstr(disk_t *dp);
 char *xml_optionstr(disk_t *dp, int to_server);
 char *xml_estimate(estimatelist_t estimatelist, am_feature_t *their_features);
-char *clean_dle_str_for_client(char *dle_str);
+char *clean_dle_str_for_client(char *dle_str, am_feature_t *their_features);
 char *xml_application(disk_t *dp, application_t *application,
                      am_feature_t *their_features);
 char *xml_scripts(identlist_t pp_scriptlist, am_feature_t *their_features);
+char *xml_dumptype_properties(disk_t *dp);
 
 /* disable_skip_disk() set the db->todo flag to 0 for each dle with 'ignore'
  * 'strategy skip'. It is useful for all programs that want to skip them,i