You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by mm...@apache.org on 2013/02/07 03:05:47 UTC
svn commit: r1443294 -
/spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/DKIM.pm
Author: mmartinec
Date: Thu Feb 7 02:05:47 2013
New Revision: 1443294
URL: http://svn.apache.org/viewvc?rev=1443294&view=rev
Log:
Plugin/DKIM.pm: adapt to a last-minute change in Mail::DKIM before its 0.40 release, [rt.cpan.org #83170], [rt.cpan.org #80425]
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=1443294&r1=1443293&r2=1443294&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/DKIM.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/DKIM.pm Thu Feb 7 02:05:47 2013
@@ -744,12 +744,11 @@ sub _check_dkim_signature {
# signature objects not provided by the caller, must verify for ourselves
my $timemethod = $self->{main}->UNIVERSAL::can("time_method") &&
$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;
- # avoid a perl warning "used only once: possible typo"
- $Mail::DKIM::DNS::RESOLVER = undef;
- $Mail::DKIM::DNS::RESOLVER = $res;
+ if (Mail::DKIM::Verifier->VERSION >= 0.40) {
+ # get our Net::DNS::Resolver object, let Mail::DKIM use the same resolver
+ my $res = $self->{main}->{resolver}->get_resolver;
+ Mail::DKIM::DNS::resolver($res);
+ }
$verifier = Mail::DKIM::Verifier->new;
if (!$verifier) {
dbg("dkim: cannot create Mail::DKIM::Verifier object");