X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=server-src%2Famidxtaped.pl;h=855d59a1f867d396720e287d766c5d8e4eebc268;hb=refs%2Ftags%2Fupstream%2F3.3.1;hp=c156a000b52039ad9d38bc3c9788ca91f4583262;hpb=cd0b924f27312d57bd42f6c4fae2b795139e2d0b;p=debian%2Famanda diff --git a/server-src/amidxtaped.pl b/server-src/amidxtaped.pl index c156a00..855d59a 100644 --- a/server-src/amidxtaped.pl +++ b/server-src/amidxtaped.pl @@ -118,7 +118,7 @@ use Sys::Hostname; use Amanda::Debug qw( debug info warning ); use Amanda::MainLoop qw( :GIOCondition ); -use Amanda::Util qw( :constants ); +use Amanda::Util qw( :constants match_disk match_host ); use Amanda::Feature; use Amanda::Config qw( :init :getconf ); use Amanda::Changer; @@ -130,7 +130,6 @@ use Amanda::Recovery::Planner; use Amanda::Recovery::Scan; use Amanda::DB::Catalog; use Amanda::Disklist; -use Amanda::Logfile qw( match_disk match_host ); # Note that this class performs its control IO synchronously. This is adequate # for this service, as it never receives unsolicited input from the remote @@ -602,6 +601,10 @@ sub send_header { # filter out some things the remote might not be able to process if (!$self->{'their_features'}->has($Amanda::Feature::fe_amrecover_dle_in_header)) { $header->{'dle_str'} = undef; + } else { + $header->{'dle_str'} = + Amanda::Disklist::clean_dle_str_for_client($header->{'dle_str'}, + Amanda::Feature::am_features($self->{'their_features'})); } if (!$self->{'their_features'}->has($Amanda::Feature::fe_amrecover_origsize_in_header)) { $header->{'orig_size'} = 0;