X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=common-src%2Famfeatures.h;h=74a23fff9333e3851fe95d2d0ab7f30e54893bfb;hb=HEAD;hp=8d9e9bddffd5f275c5bd5d68c9b8bc06f3ab1934;hpb=eefb15c5c04acb3c75f0c704ea664feb1bbae75c;p=debian%2Famanda

diff --git a/common-src/amfeatures.h b/common-src/amfeatures.h
index 8d9e9bd..74a23ff 100644
--- a/common-src/amfeatures.h
+++ b/common-src/amfeatures.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
@@ -25,7 +26,7 @@
  */
 
 /*
- * $Id: amfeatures.h,v 1.15 2006/03/14 13:11:58 martinea Exp $
+ * $Id: amfeatures.h,v 1.21 2006/07/19 17:46:07 martinea Exp $
  *
  * Define feature test related items.
  */
@@ -67,7 +68,6 @@ typedef enum {
      *
      *	auth=BSD
      *	auth=RSH
-     *	auth=KRB4
      *	auth=krb5
      *
      * and so on.
@@ -93,7 +93,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,
@@ -152,6 +152,48 @@ typedef enum {
     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,
+    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.
@@ -159,6 +201,9 @@ typedef enum {
     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;
@@ -167,14 +212,18 @@ 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_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);
+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 */