MailScanner/v5
1
1
Fork 0
mirror of https://github.com/MailScanner/v5.git synced 2025-02-24 23:44:33 +08:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixup! Postfix: correctly remove all recipients in DeleteRecipients (#239) (#243)

Browse source
This commit is contained in:
Giorgio Premi 2018-10-11 01:48:14 +02:00 committed by Shawn Iverson
parent 9da976a29b
commit 5fa2c390da
1 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
common/usr/share/MailScanner/perl/MailScanner/Postfix.pm
View file

@ -1355,13 +1355,9 @@ sub new {
#print STDERR "Deleting Recipients!\n";
my($linenum);
for ($linenum=0; $linenum<@{$message->{metadata}}; $linenum++) {
# Looking for "recipient" lines
# Should allow 'O' here as well
# JKF 30/08/2006 next unless $message->{metadata}[$linenum] =~ /^[RO]/;
# Thanks to Holger Gebhard for this.
#BUGGY: next unless $message->{metadata}[$linenum] =~ /^[ARO].+@(?:\w|-|\.)+\.\w{2,})/;
#next unless $message->{metadata}[$linenum] =~ /^[ARO]/;
next unless $message->{metadata}[$linenum] =~ /^[ARO].+\@[a-zA-Z0-9\-.]+/;
# Looking for all type of "recipient" records interpreted by Postfix
# See https://github.com/MailScanner/v5/pull/239
next unless $message->{metadata}[$linenum] =~ /^(?:R|O|Adsn_orig_rcpt)/;
# Have found the right line
#print STDERR "Deleting recip " . $message->{metadata}[$linenum] . "\n";
splice(@{$message->{metadata}}, $linenum, 1);