You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by gb...@apache.org on 2023/05/02 09:49:42 UTC
svn commit: r1909562 - /spamassassin/trunk/lib/Mail/SpamAssassin/SQLBasedAddrList.pm
Author: gbechis
Date: Tue May 2 09:49:42 2023
New Revision: 1909562
URL: http://svn.apache.org/viewvc?rev=1909562&view=rev
Log:
missed in previous
bz #7764
Modified:
spamassassin/trunk/lib/Mail/SpamAssassin/SQLBasedAddrList.pm
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/SQLBasedAddrList.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/SQLBasedAddrList.pm?rev=1909562&r1=1909561&r2=1909562&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/SQLBasedAddrList.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/SQLBasedAddrList.pm Tue May 2 09:49:42 2023
@@ -298,7 +298,7 @@ sub add_score {
{ my @fields = qw(username email ip msgcount totscore);
my @signedby;
- if ($self->{_with_awl_signer}) {
+ if ($self->{_with_awl_signer} || (defined $signedby and $signedby =~ /^spf\-/)) {
push(@fields, 'signedby');
@signedby = !defined $signedby ? () : split(' ', lc $signedby);
@signedby = ( '' ) if !@signedby;
@@ -320,7 +320,7 @@ sub add_score {
return $entry;
}
- if (!$self->{_with_awl_signer}) {
+ if (!$self->{_with_awl_signer} && !(defined $signedby and $signedby =~ /^spf\-/)) {
my $rc;
if ($self->{dsn} =~ /^DBI:(?:pg|SQLite|mysql|MariaDB)/i) {
$rc = $sth->execute(@args, $entry->{msgcount}, $score);