You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by jm...@apache.org on 2005/12/19 08:48:01 UTC

svn commit: r357663 - /spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/DomainKeys.pm

Author: jm
Date: Sun Dec 18 23:47:59 2005
New Revision: 357663

URL: http://svn.apache.org/viewcvs?rev=357663&view=rev
Log:
bug 4623: use Mail::DomainKeys::Message::signature() API if it exists, otherwise fall back to the old API

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

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/DomainKeys.pm
URL: http://svn.apache.org/viewcvs/spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/DomainKeys.pm?rev=357663&r1=357662&r2=357663&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/DomainKeys.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/DomainKeys.pm Sun Dec 18 23:47:59 2005
@@ -211,7 +211,15 @@
 # get the DK status "header" from the Mail::DomainKeys::Message object
 sub _dkmsg_hdr {
   my ($self, $message) = @_;
-  return $message->header->value();
+  # try to use the signature() API if it exists (post-0.80)
+  if ($message->can("signature")) {
+    if (!$message->signed) {
+      return "no signature";
+    }
+    return $message->signature->status;
+  } else {
+    return $message->header->value;
+  }
 }
 
 sub sanitize_header_for_dk {