You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by do...@apache.org on 2005/03/27 04:10:39 UTC
svn commit: r159133 - in spamassassin/trunk/lib/Mail/SpamAssassin: Conf.pm
Plugin/SPF.pm
Author: dos
Date: Sat Mar 26 18:10:38 2005
New Revision: 159133
URL: http://svn.apache.org/viewcvs?view=rev&rev=159133
Log:
bug 4140: add option to allow SPF checks to work through trusted relays
Modified:
spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm
spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/SPF.pm
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm
URL: http://svn.apache.org/viewcvs/spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm?view=diff&r1=159132&r2=159133
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm Sat Mar 26 18:10:38 2005
@@ -1115,6 +1115,19 @@
}
});
+=item always_trust_envelope_sender ( 0 | 1 ) (default: 0)
+
+Trust the envelope sender even if the message has been passed through one or
+more trusted relays.
+
+=cut
+
+ push (@cmds, {
+ setting => 'always_trust_envelope_sender',
+ default => 0,
+ type => $CONF_TYPE_BOOL
+ });
+
=item skip_rbl_checks ( 0 | 1 ) (default: 0)
By default, SpamAssassin will run RBL checks. If your ISP already does this
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/SPF.pm
URL: http://svn.apache.org/viewcvs/spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/SPF.pm?view=diff&r1=159132&r2=159133
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/SPF.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/SPF.pm Sat Mar 26 18:10:38 2005
@@ -333,7 +333,7 @@
else {
# We cannot use the env-from data, since it went through 1 or more relays
# since the untrusted sender and they may have rewritten it.
- if ($scanner->{num_relays_trusted} > 0) {
+ if ($scanner->{num_relays_trusted} > 0 && !$scanner->{conf}->{always_trust_envelope_sender}) {
dbg("spf: relayed through one or more trusted relays, cannot use header-based Envelope-From, skipping");
return;
}
Re: svn commit: r159133 - in spamassassin/trunk/lib/Mail/SpamAssassin:
Conf.pm Plugin/SPF.pm
Posted by "Daryl C. W. O'Shea" <sp...@dostech.ca>.
Daniel Quinlan wrote:
> dos@apache.org writes:
>
>
>>bug 4140: add option to allow SPF checks to work through trusted relays
>
>
> Do we really need this option now that you made the other change to
> extend trust?
>
> Daniel
Yes. If you've got a setup where you've got one or more trusted hosts
before the host running SpamAssassin the option is needed.
Without it you can only do SPF helo checks, but won't be able to do
regular SPF checks (and thus won't be able to detect SPF fail, etc).
Daryl
Re: svn commit: r159133 - in spamassassin/trunk/lib/Mail/SpamAssassin:
Conf.pm Plugin/SPF.pm
Posted by "Daryl C. W. O'Shea" <sp...@dostech.ca>.
Daniel Quinlan wrote:
> dos@apache.org writes:
>
>
>>bug 4140: add option to allow SPF checks to work through trusted relays
>
>
> Do we really need this option now that you made the other change to
> extend trust?
>
> Daniel
Yes. If you've got a setup where you've got one or more trusted hosts
before the host running SpamAssassin the option is needed.
Without it you can only do SPF helo checks, but won't be able to do
regular SPF checks (and thus won't be able to detect SPF fail, etc).
Daryl
Re: svn commit: r159133 - in spamassassin/trunk/lib/Mail/SpamAssassin: Conf.pm Plugin/SPF.pm
Posted by Daniel Quinlan <qu...@pathname.com>.
dos@apache.org writes:
> bug 4140: add option to allow SPF checks to work through trusted relays
Do we really need this option now that you made the other change to
extend trust?
Daniel
--
Daniel Quinlan
http://www.pathname.com/~quinlan/
Re: svn commit: r159133 - in spamassassin/trunk/lib/Mail/SpamAssassin: Conf.pm Plugin/SPF.pm
Posted by Daniel Quinlan <qu...@pathname.com>.
dos@apache.org writes:
> bug 4140: add option to allow SPF checks to work through trusted relays
Do we really need this option now that you made the other change to
extend trust?
Daniel
--
Daniel Quinlan
http://www.pathname.com/~quinlan/