MailScanner/v5
1
1
Fork 0
mirror of https://github.com/MailScanner/v5.git synced 2024-09-20 07:16:10 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Detect sender on first instance only (#524)

Browse source
This commit is contained in:
Shawn Iverson 2021-01-10 06:09:24 -05:00 committed by GitHub
parent a0230c3b85
commit 3482eb02c6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
common/usr/share/MailScanner/perl/MailScanner/MSMail.pm
View file

@ -897,6 +897,7 @@ sub new {
my($line);
my @recipient;
my $recipientfound = 0;
my $senderfound = 0;
my $permfail = 0;
my($sender);
my $opts = '';
@ -948,6 +949,7 @@ sub new {
next;
}
$recipientfound = 0;
$senderfound = 0;
# Read in pre-data header
my $msgstart = 0;
while(!eof($queuehandle)) {
@ -960,9 +962,10 @@ sub new {
MailScanner::Log::DebugLog("MSMail: KickMessage: recipient = $line");
$msgstart = tell $queuehandle;
next;
} elsif ($line =~ /^S/) {
} elsif ($line =~ /^S/ && $senderfound == 0) {
$line =~ s/^S//;
$sender = $line;
$senderfound = 1;
MailScanner::Log::DebugLog("MSMail: KickMessage: sender = $sender");
$msgstart = tell $queuehandle;
} elsif ($line =~ /^E</) {