X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=common-src%2Famfeatures.h;h=7934088b98a57d18a8e8e1162f6c689e10bbc250;hb=fd48f3e498442f0cbff5f3606c7c403d0566150e;hp=645f283d462bc89c29aaa90b465e5e01e4a1c80b;hpb=0de2ad0a86685398621fb8ffa6990c029681bb3a;p=debian%2Famanda

diff --git a/common-src/amfeatures.h b/common-src/amfeatures.h
index 645f283..7934088 100644
--- a/common-src/amfeatures.h
+++ b/common-src/amfeatures.h
@@ -25,7 +25,7 @@
  */
 
 /*
- * $Id: amfeatures.h,v 1.1.2.6.2.3 2004/08/11 19:16:28 martinea Exp $
+ * $Id: amfeatures.h,v 1.21 2006/07/19 17:46:07 martinea Exp $
  *
  * Define feature test related items.
  */
@@ -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,
+    fe_program_application_api,		/* require fe_sendsize_req_options */
 
     fe_options_compress_fast,
     fe_options_compress_best,
@@ -138,12 +137,66 @@ typedef enum {
     fe_calcsize_estimate,
     fe_selfcheck_calcsize,
 
+    fe_recover_splits,
+    fe_amidxtaped_exchange_features,
+
+    fe_options_compress_cust,
+    fe_options_srvcomp_cust,
+    fe_options_encrypt_cust,
+    fe_options_encrypt_serv_cust,
+    fe_options_client_decrypt_option,
+    fe_options_server_decrypt_option,
+
+    fe_amindexd_marshall_in_OLSD,
+    fe_amindexd_marshall_in_ORLD,
+    fe_amindexd_marshall_in_DHST,
+    fe_amrecover_FEEDME,
+    fe_amrecover_timestamp,
+
+    fe_interface_quoted_text,
+
+    fe_program_star,
+
+    fe_amindexd_options_hostname,
+    fe_amindexd_options_features,
+    fe_amindexd_options_auth,
+
+    fe_amidxtaped_options_hostname,
+    fe_amidxtaped_options_features,
+    fe_amidxtaped_options_auth,
+
+    fe_amrecover_message,
+    fe_amrecover_feedme_tape,
+
+    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,
+
     /*
      * 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;
@@ -152,14 +205,17 @@ typedef struct am_feature_s {
 /*
  * Functions.
  */
-extern am_feature_t *am_init_feature_set P((void));
-extern am_feature_t *am_set_default_feature_set P((void));
-extern am_feature_t *am_allocate_feature_set P((void));
-extern void am_release_feature_set P((am_feature_t *));
-extern int am_add_feature P((am_feature_t *f, am_feature_e n));
-extern int am_remove_feature P((am_feature_t *f, am_feature_e n));
-extern int am_has_feature P((am_feature_t *f, am_feature_e n));
-extern char *am_feature_to_string P((am_feature_t *f));
-extern am_feature_t *am_string_to_feature P((char *s));
+
+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);
+extern void am_release_feature_set(am_feature_t *);
+extern int am_add_feature(am_feature_t *f, am_feature_e n);
+extern int am_remove_feature(am_feature_t *f, am_feature_e n);
+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 */