You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by fe...@apache.org on 2004/07/20 20:02:22 UTC

svn commit: rev 23086 - spamassassin/trunk/lib/Mail/SpamAssassin

Author: felicity
Date: Tue Jul 20 11:02:21 2004
New Revision: 23086

Modified:
   spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgStatus.pm
Log:
bug 3612: the code was looking at the header name, not the header value, if envelope_sender_header was specified.

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgStatus.pm
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgStatus.pm	(original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/PerMsgStatus.pm	Tue Jul 20 11:02:21 2004
@@ -2385,10 +2385,8 @@
   # We assume this is correct, *even* if the fetchmail/X-Sender screwup
   # appears.
   $envf = $self->{conf}->{envelope_sender_header};
-  if (defined $envf) {
-    if ($self->get ($envf) =~ /\@/) {
-      goto ok;
-    }
+  if ((defined $envf) && ($envf = $self->get($envf)) && ($envf =~ /\@/)) {
+    goto ok;
   }
 
   # WARNING: a lot of list software adds an X-Sender for the original env-from