You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by he...@apache.org on 2022/05/06 05:53:16 UTC
svn commit: r1900614 - /spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/FromNameSpoof.pm
Author: hege
Date: Fri May 6 05:53:16 2022
New Revision: 1900614
URL: http://svn.apache.org/viewvc?rev=1900614&view=rev
Log:
Make if logic a little more straightforward
Modified:
spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/FromNameSpoof.pm
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/FromNameSpoof.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/FromNameSpoof.pm?rev=1900614&r1=1900613&r2=1900614&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/FromNameSpoof.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/FromNameSpoof.pm Fri May 6 05:53:16 2022
@@ -241,18 +241,17 @@ sub parsed_metadata {
# If fns_ignore_dkim used, force wait for DKIM results
if (%{$pms->{conf}->{fns_ignore_dkim}}) {
- # Check that DKIM module is loaded
- if (exists $pms->{conf}->{dkim_timeout}) {
- if (!$self->{main}->{local_tests_only}) {
- # Initialize async queue, any eval calls will queue their checks
- $pms->{fromname_async_queue} = [];
- # Process and finish queue as soon as DKIM is ready
- $pms->action_depends_on_tags('DKIMDOMAIN', sub {
- $self->_check_async_queue($pms);
- });
- } else {
- dbg("local tests only, ignoring fns_ignore_dkim setting");
- }
+ if ($self->{main}->{local_tests_only}) {
+ dbg("local tests only, ignoring fns_ignore_dkim setting");
+ }
+ # Check that DKIM module is loaded (a bit kludgy check)
+ elsif (exists $pms->{conf}->{dkim_timeout}) {
+ # Initialize async queue, any eval calls will queue their checks
+ $pms->{fromname_async_queue} = [];
+ # Process and finish queue as soon as DKIM is ready
+ $pms->action_depends_on_tags('DKIMDOMAIN', sub {
+ $self->_check_async_queue($pms);
+ });
} else {
dbg("DKIM plugin not loaded, ignoring fns_ignore_dkim setting");
}