You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by fk...@apache.org on 2025/01/16 21:56:50 UTC

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

Author: fkento
Date: Thu Jan 16 21:56:50 2025
New Revision: 1923176

URL: http://svn.apache.org/viewvc?rev=1923176&view=rev
Log:
Use custom resolver, which supports TCP fallback since 4.0.1

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=1923176&r1=1923175&r2=1923176&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/DKIM.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/DKIM.pm Thu Jan 16 21:56:50 2025
@@ -742,18 +742,10 @@ sub _dkim_load_modules {
              "minimal version 0.31, suggested upgrade to 0.37 or later!");
       }
       if (version->parse($version) >= version->parse(0.40)) {
-        my $edns = $self->{main}->{conf}->{dns_options}->{edns};
-        if ($edns && $edns >= 1024) {
-          # Let Mail::DKIM use our interface to Net::DNS::Resolver.
-          # Only do so if EDNS0 provides a reasonably-sized UDP payload size,
-          # as our interface does not provide a DNS fallback to TCP, unlike
-          # the Net::DNS::Resolver::send which does provide it.
-          # See also Bug 7265 regarding a choice of a resolver.
-          # my $res = $self->{main}->{resolver}->get_resolver;
-          my $res = $self->{main}->{resolver};
-          dbg("dkim: providing our own resolver: %s", ref $res);
-          Mail::DKIM::DNS::resolver($res);
-        }
+        # Let Mail::DKIM use our interface to Net::DNS::Resolver.
+        my $res = $self->{main}->{resolver};
+        dbg("dkim: providing our own resolver: %s", ref $res);
+        Mail::DKIM::DNS::resolver($res);
       }
       $self->{service_available} = 1;