svn commit: r1443004 - /spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/DKIM.pm

[mm...@apache.org]

Author: mmartinec
Date: Wed Feb  6 15:12:51 2013
New Revision: 1443004

URL: http://svn.apache.org/viewvc?rev=1443004&view=rev
Log:
Now that Mail::DKIM 0.40 is coming out, adapt the DKIM plugin to use the official way of supplying a DNS resolver object to Mail::DKIM

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

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/DKIM.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/DKIM.pm?rev=1443004&r1=1443003&r2=1443004&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/DKIM.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/DKIM.pm Wed Feb  6 15:12:51 2013
@@ -746,8 +746,11 @@ sub _check_dkim_signature {
                      $self->{main}->time_method("check_dkim_signature");
     # get our Net::DNS::Resolver object, let Mail::DKIM use the same resolver
     my $res = $self->{main}->{resolver}->get_resolver;
-    # the DnsResolver option is recognized by Mail::DKIM::Verifier since 0.40
-    $verifier = Mail::DKIM::Verifier->new(DnsResolver => $res);
+    # the DnsResolver option is recognized by Mail::DKIM::Verifier since 0.40;
+    # avoid a perl warning "used only once: possible typo"
+    $Mail::DKIM::DNS::RESOLVER = undef;
+    $Mail::DKIM::DNS::RESOLVER = $res;
+    $verifier = Mail::DKIM::Verifier->new;
     if (!$verifier) {
       dbg("dkim: cannot create Mail::DKIM::Verifier object");
       return;