Imported Upstream version 3.3.3

[debian/amanda] / perl / Amanda / Config.swg

diff --git a/perl/Amanda/Config.swg b/perl/Amanda/Config.swg
index 3049a135ae3b5ad8880adb8cad135e0face42f4b..16e08f9ce1637b90f9d58d58e93cc95752ba2b16 100644 (file)
--- a/perl/Amanda/Config.swg
+++ b/perl/Amanda/Config.swg
@@ -1,9 +1,10 @@
 /*
- * Copyright (c) 2007, 2008, 2009, 2010 Zmanda, Inc.  All Rights Reserved.
+ * Copyright (c) 2007-2012 Zmanda, Inc.  All Rights Reserved.
  *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 as published
- * by the Free Software Foundation.
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
@@ -93,6 +94,7 @@ APPLY(CNF_BUMPMULT)\
 APPLY(CNF_BUMPDAYS)\
 APPLY(CNF_TPCHANGER)\
 APPLY(CNF_RUNTAPES)\
+APPLY(CNF_MAX_DLE_BY_VOLUME)\
 APPLY(CNF_MAXDUMPS)\
 APPLY(CNF_ETIMEOUT)\
 APPLY(CNF_DTIMEOUT)\
@@ -143,7 +145,11 @@ APPLY(CNF_SEND_AMREPORT_ON)\
 APPLY(CNF_TAPER_PARALLEL_WRITE)\
 APPLY(CNF_RECOVERY_LIMIT) \
 APPLY(CNF_INTERACTIVITY) \
-APPLY(CNF_TAPERSCAN)
+APPLY(CNF_TAPERSCAN) \
+APPLY(CNF_EJECT_VOLUME) \
+APPLY(CNF_TMPDIR) \
+APPLY(CNF_REPORT_USE_MEDIA) \
+APPLY(CNF_REPORT_NEXT_MEDIA)
 
 amglue_add_enum_tag_fns(confparm_key);
 amglue_add_constants(FOR_ALL_CONFPARM_KEY, confparm_key);
@@ -213,6 +219,7 @@ APPLY(DUMPTYPE_SCRIPTLIST)\
 APPLY(DUMPTYPE_PROPERTY)\
 APPLY(DUMPTYPE_DATA_PATH)\
 APPLY(DUMPTYPE_ALLOW_SPLIT)\
+APPLY(DUMPTYPE_MAX_WARNINGS)\
 APPLY(DUMPTYPE_RECOVERY_LIMIT) \
 APPLY(DUMPTYPE_DUMP_LIMIT)
 
@@ -691,7 +698,7 @@ typedef char **val_t_strs;
 val_t_strs getconf_byname_strs(char *key, int str_needs_quotes) {
     val_t *val = getconf_byname(key);
     if (!val) return NULL;
-    return val_t_display_strs(val, str_needs_quotes);
+    return val_t_display_strs(val, str_needs_quotes, FALSE, FALSE);
 }
 %}
 
@@ -907,7 +914,7 @@ amglue_export_tag(init,
  * Miscellaneous
  */
 
-void dump_configuration(void);
+void dump_configuration(gboolean print_default, gboolean print_source);
 %newobject config_dir_relative;
 char *config_dir_relative(char *filename);
 char *taperalgo2str(taperalgo_t taperalgo);
@@ -932,5 +939,6 @@ sub string_to_boolean {
 
 amglue_export_ok(string_to_boolean);
 
+%newobject amandaify_property_name;
 gchar * amandaify_property_name(const gchar *name);
 amglue_export_ok(amandaify_property_name);