File amavisd.patch of Package zimbra-amavisd

Overview Repositories Revisions Requests Users Attributes Meta

File amavisd.patch of Package zimbra-amavisd

--- amavisd-new-2.9.0/amavisd.orig	2015-03-05 16:30:36.986054097 -0600
+++ amavisd-new-2.9.0/amavisd	2015-03-05 16:30:36.954038098 -0600
@@ -4,6 +4,8 @@
 ### #!/usr/bin/perl -d:NYTProf
 ###   NYTPROF=start=no:addpid=1:forkdepth=1 amavisd -m 5 foreground
 
+use lib $ENV{PERL5LIB} =~ /([^:]+)/g; # Untaint PERL5LIB so Zimbra's modules can be used
+
 #------------------------------------------------------------------------------
 # This is amavisd-new.
 # It is an interface between a message transfer agent (MTA) and virus
@@ -5039,6 +5041,9 @@
     my(@dkeys); my $d = $domain;
     for (;;) {            # (@).sub.example.com (@).example.com (@).com (@).
       push(@dkeys, $prepend_to_domain.'.'.$d);
+      if ($d ne '') {
+        push(@dkeys, $d);
+      }
       last  if $d eq '';
       $d = ($d =~ /^([^.]*)\.(.*)\z/s) ? $2 : '';
     }
@@ -11328,7 +11333,7 @@
     P => sub {$MSGINFO->partition_tag}, # SQL partition tag
     partition_tag => sub {$MSGINFO->partition_tag},  # synonym for %P
     q => sub { my $q = $MSGINFO->quarantined_to;
-               $q && [map { my $m=$_; $m=~s{^\Q$QUARANTINEDIR\E/}{}; $m } @$q];
+               $q && [map { my($m)=$_; $m=~s{^\Q$QUARANTINEDIR\E/}{}; $m=~s/^march.*\.archive$//; $m } @$q];
              },  # list of quarantine mailboxes
     v => sub { !defined $av_output ? undef     # anti-virus scanner output
                  : [split(/[ \t]*\r?\n/, $av_output)]},
@@ -16579,6 +16584,15 @@
     }
   }  # endfor per_recip_data
 
+  if (defined($qar_method) && $qar_method ne '') {  # archiving quarantine on sender
+    my($sender) = $msginfo->sender;
+    if ($sender ne '') {
+      my($q) = lookup(0,$sender,@{ca('archive_quarantine_to_maps')});
+      $q = $sender  if $q ne '' && $qar_method =~ /^bsmtp:/i;  # orig.recip
+      push(@q_tuples, [$qar_method,$q,'Arch'])  if defined $q && $q ne '';
+    }
+  }
+
   if ($ccat == CC_SPAM) {
     my $sqbsm = ca('spam_quarantine_bysender_to_maps');
     if (@$sqbsm) {  # by-sender spam quarantine (hardly useful, rarely used)
@@ -17589,7 +17603,7 @@
   push(@{/^no_conf_file_writable_check\z/ ? \@known : \@unknown}, $_)
     for grep($i_know_what_i_am_doing{$_}, keys %i_know_what_i_am_doing);
   $unknown[0] = 'unknown: ' . $unknown[0]  if @unknown;
-  warn sprintf("I know what I'm doing: %s\n", join(', ',@known,@unknown));
+  #warn sprintf("I know what I'm doing: %s\n", join(', ',@known,@unknown));
 }
 
 # deal with debugging early, based on a command line arg

Places

File amavisd.patch of Package zimbra-amavisd

Places