Index: lib/Mail/SpamAssassin/Message/Metadata/Received.pm
===================================================================
--- lib/Mail/SpamAssassin/Message/Metadata/Received.pm  (revision 1850997)
+++ lib/Mail/SpamAssassin/Message/Metadata/Received.pm  (working copy)
@@ -619,6 +619,18 @@
       }
     }
 
+    elsif (/ \(amavisd-milter\)\;/) {
+      # Received: from localhost ([127.0.0.1] [127.0.0.1])
+      # by mail.local (amavisd-milter);
+      # # Thu, 10 Jan 2019 17:15:10 -0500 (EST)
+      if ( /^(\S+) \((\S+) \[(${IP_ADDRESS})\]\) by (\S+) / ) {
+       $mta_looked_up_dns = 1;
+       $helo = $1; $rdns = $2; $ip = $3; $by = $4;
+       if ($rdns =~ /^\[/) { $rdns = ''; }
+       goto enough;
+      }
+    }
+
     elsif (/\(Scalix SMTP Relay/) {
       # from DPLAPTOP ( 72.242.176.162) by mail.puryear-it.com (Scalix SMTP 
Relay 10.0.1.3) via ESMTP; Fri, 23 Jun 2006 16:39:47 -0500 (CDT)
       if (/^(\S+) \( ?(${IP_ADDRESS})\) by (\S+)/) {

Attachment: detect-received-amavisd-milter.patch
Description: Binary data



Reply via email to