Imported Upstream version 3.3.2

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

diff --git a/common-src/amfeatures.h b/common-src/amfeatures.h
index 562ca2193d99b5fe687b0b96b3bed429b386dc9e..f0d755957863feac5cf7d87104bc85a3c8803b2c 100644 (file)
--- a/common-src/amfeatures.h
+++ b/common-src/amfeatures.h
@@ -67,7 +67,6 @@ typedef enum {
      *
      * auth=BSD
      * auth=RSH
-     * auth=KRB4
      * auth=krb5
      *
      * and so on.
@@ -93,7 +92,7 @@ typedef enum {
 
     fe_program_dump,
     fe_program_gnutar,
-    fe_program_dumper_api,             /* require fe_sendsize_req_options */
+    fe_program_application_api,                /* require fe_sendsize_req_options */
 
     fe_options_compress_fast,
     fe_options_compress_best,
@@ -171,12 +170,39 @@ typedef enum {
 
     fe_req_options_config,
 
+    fe_rep_sendsize_quoted_error,
+    fe_req_xml,
+    fe_pp_script,      // only in XML
+    fe_amindexd_DLE,
+    fe_amrecover_dle_in_header,
+    fe_xml_estimate,
+    fe_xml_property_priority,
+    fe_sendsize_rep_warning,
+    fe_xml_estimatelist,
+    fe_xml_level_server,
+    fe_xml_data_path,
+    fe_xml_directtcp_list,
+    fe_amidxtaped_datapath,
+    fe_sendbackup_noop,
+    fe_amrecover_origsize_in_header,
+    fe_amidxtaped_abort,
+    fe_amrecover_correct_disk_quoting,
+    fe_amindexd_quote_label,
+
+    fe_amrecover_receive_unfiltered,
+    fe_application_client_name,
+    fe_script_client_name,
+    fe_dumptype_property,
+
     /*
      * All new features must be inserted immediately *before* this entry.
      */
     last_feature
 } am_feature_e;
 
+/* don't include this struct or the subsequent functions in Amanda::Feature SWIG */
+#ifndef AMANDA_FEATURE_SWG
+
 typedef struct am_feature_s {
     size_t             size;
     unsigned char      *bytes;
@@ -185,6 +211,8 @@ typedef struct am_feature_s {
 /*
  * Functions.
  */
+
+extern am_feature_t *am_features(am_feature_t *f);
 extern am_feature_t *am_init_feature_set(void);
 extern am_feature_t *am_set_default_feature_set(void);
 extern am_feature_t *am_allocate_feature_set(void);
@@ -195,4 +223,6 @@ extern int am_has_feature(am_feature_t *f, am_feature_e n);
 extern char *am_feature_to_string(am_feature_t *f);
 extern am_feature_t *am_string_to_feature(char *s);
 
+#endif
+
 #endif /* !AMFEATURES_H */