svn commit: r1936253 - spamassassin/trunk/lib/Mail/SpamAssassin/Plugin

[email protected] Fri, 17 Jul 2026 10:44:30 -0000
Newsgroups gmane.mail.spam.spamassassin.cvs
Message-ID <178428507062.3785976.11438797604122217357@svn03-he-fi>
Author: gbechis
Date: Fri Jul 17 10:44:30 2026
New Revision: 1936253

Log:
silence a warning when saving the DMARC report and no DKIM record is present

Modified:
   spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/DMARC.pm

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/DMARC.pm
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/DMARC.pm	Fri Jul 17 10:36:54 2026	(r1936252)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/DMARC.pm	Fri Jul 17 10:44:30 2026	(r1936253)
@@ -362,7 +362,13 @@ sub _check_dmarc {
       dbg("DKIM result for domain " . $signature->domain . ": " . $signature->result);
     }
   } else {
-    $dmarc->dkim($pms->{dkim_verifier}) if (ref($pms->{dkim_verifier}));
+    if (ref($pms->{dkim_verifier})) {
+      $dmarc->dkim($pms->{dkim_verifier});
+    } else {
+      # No DKIM signature/verifier available; record an explicit "none"
+      # result so save_aggregate() doesn't choke on an unset dkim field.
+      $dmarc->dkim([{ domain => '', result => 'none' }]);
+    }
   }
 
   my $result;