https://issues.apache.org/SpamAssassin/show_bug.cgi?id=5994


John Hein <[EMAIL PROTECTED]> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
            Summary|whitelist_bounce_relays     |whitelist_bounce_relays
                   |misses mail from cron jobs  |misses mail from cron jobs
                   |(for example)               |(for example) [patch]




--- Comment #1 from John Hein <[EMAIL PROTECTED]>  2008-10-07 08:27:06 PST ---
I'm still pondering whether this will always work (mostly whether it makes
sense for the various flavors of Received: header).  But here's a patch that
has been working better for me.

This is against 3.5.2, and I saw that the trunk has changed a little in this
area (handles multi-line Received: headers better?), so consider the patch in
that context.

--- VBounce.pm.orig     2008-06-10 03:20:21.000000000 -0600
+++ VBounce.pm  2008-10-07 09:21:23.000000000 -0600
@@ -106,8 +106,8 @@
   # check the plain-text body, first
   foreach my $line (@{$body}) {
     next unless ($line =~ /Received: /);
-    while ($line =~ / (\S+\.\S+) /g) {
-      return 1 if $self->_relay_is_in_whitelist_bounce_relays($pms, $1);
+    while ($line =~ /(\S+@)*([^\s)]+)\)*/g) {
+      return 1 if $self->_relay_is_in_whitelist_bounce_relays($pms, $2);
     }
   }

@@ -118,8 +118,8 @@
   my $pristine = $pms->{msg}->get_pristine_body();
   foreach my $line ($pristine =~ /^(.*)$/gm) {
     next unless $line && ($line =~ /Received: /);
-    while ($line =~ / (\S+\.\S+) /g) {
-      return 1 if $self->_relay_is_in_whitelist_bounce_relays($pms, $1);
+    while ($line =~ /(\S+@)*([^\s)]+)\)*/g) {
+      return 1 if $self->_relay_is_in_whitelist_bounce_relays($pms, $2);
     }
   }



-- 
Configure bugmail: 
https://issues.apache.org/SpamAssassin/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the assignee for the bug.

Reply via email to