summaryrefslogtreecommitdiffstats
path: root/main/spamassassin/spamassassin-3.4.0-dns-resolver.patch
diff options
context:
space:
mode:
Diffstat (limited to 'main/spamassassin/spamassassin-3.4.0-dns-resolver.patch')
-rw-r--r--main/spamassassin/spamassassin-3.4.0-dns-resolver.patch16
1 files changed, 16 insertions, 0 deletions
diff --git a/main/spamassassin/spamassassin-3.4.0-dns-resolver.patch b/main/spamassassin/spamassassin-3.4.0-dns-resolver.patch
new file mode 100644
index 000000000..b593a1d96
--- /dev/null
+++ b/main/spamassassin/spamassassin-3.4.0-dns-resolver.patch
@@ -0,0 +1,16 @@
+--- a/lib/Mail/SpamAssassin/DnsResolver.pm
++++ b/lib/Mail/SpamAssassin/DnsResolver.pm
+@@ -204,8 +204,10 @@
+ @ns_addr_port = @{$self->{conf}->{dns_servers}};
+ dbg("dns: servers set by config to: %s", join(', ',@ns_addr_port));
+ } elsif ($res) { # default as provided by Net::DNS, e.g. /etc/resolv.conf
+- @ns_addr_port = map(untaint_var("[$_]:" . $res->{port}),
+- @{$res->{nameservers}});
++ my @ns = $res->UNIVERSAL::can('nameservers') ? $res->nameservers
++ : @{$res->{nameservers}};
++ my $port = $res->UNIVERSAL::can('port') ? $res->port : $res->{port};
++ @ns_addr_port = map(untaint_var("[$_]:" . $port), @ns);
+ dbg("dns: servers obtained from Net::DNS : %s", join(', ',@ns_addr_port));
+ }
+ return @ns_addr_port;
+Only in b: lib/Mail/patch.patch