Merge commit 'upstream/3.3.0'

[debian/amanda] / perl / Amanda / Feature.pm

diff --git a/perl/Amanda/Feature.pm b/perl/Amanda/Feature.pm
index e516ddd5b3b678df4a0e1160180c9b27867d2da9..7e2fb8c566bdf606209c9a2b84be5736af061fc3 100644 (file)
--- a/perl/Amanda/Feature.pm
+++ b/perl/Amanda/Feature.pm
@@ -194,6 +194,10 @@ package Amanda::Feature;
 *fe_amrecover_origsize_in_header = *Amanda::Featurec::fe_amrecover_origsize_in_header;
 *fe_amidxtaped_abort = *Amanda::Featurec::fe_amidxtaped_abort;
 *fe_amrecover_correct_disk_quoting = *Amanda::Featurec::fe_amrecover_correct_disk_quoting;
+*fe_amindexd_quote_label = *Amanda::Featurec::fe_amindexd_quote_label;
+*fe_amrecover_receive_unfiltered = *Amanda::Featurec::fe_amrecover_receive_unfiltered;
+*fe_application_client_name = *Amanda::Featurec::fe_application_client_name;
+*fe_script_client_name = *Amanda::Featurec::fe_script_client_name;
 *last_feature = *Amanda::Featurec::last_feature;
 
 @EXPORT_OK = ();
@@ -407,6 +411,20 @@ This feature is no longer supported.
 Amrecovers that do not have this flag may send incorrectly-quoted DISK lines, so
 those DISK lines should be ignored.
 
+=item fe_amindexd_quote_label
+
+ PROTOCOL: amindexd
+ FEATURE OF: server
+
+If set, amindexd quote the label (holdingdisk filename)
+
+=item fe_amrecover_receive_unfiltered
+
+ PROTOCOL: amidxtaped
+ FEATURE OF: client
+
+If set, amidxtaped do not decompress/decrypt client compressed/decrypted stream.
+
 =back
 
 =cut