File: skip-CNAME-checks-if-dns_max_cname_cache-%3D%3D-0.patch

package info (click to toggle)
spamassassin 4.0.2-2
  • links: PTS, VCS
  • area: main
  • in suites: forky, sid
  • size: 22,988 kB
  • sloc: perl: 88,863; ansic: 5,193; sh: 3,737; javascript: 339; sql: 295; makefile: 209; python: 49
file content (23 lines) | stat: -rw-r--r-- 1,245 bytes parent folder | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
From 893e6dc80144942d5b1df3f5cd2472e5d102ec7b Mon Sep 17 00:00:00 2001
From: Giovanni Bechis <gbechis@apache.org>
Date: Fri, 5 Sep 2025 06:36:52 +0000
Subject: [PATCH] skip CNAME checks if dns_max_cname_cache == 0

git-svn-id: https://svn.apache.org/repos/asf/spamassassin/trunk@1928240 13f79535-47bb-0310-9956-ffa450edef68
---
 lib/Mail/SpamAssassin/PerMsgStatus.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Mail/SpamAssassin/PerMsgStatus.pm b/lib/Mail/SpamAssassin/PerMsgStatus.pm
index f39b1b6e3f..171648cf9b 100644
--- a/lib/Mail/SpamAssassin/PerMsgStatus.pm
+++ b/lib/Mail/SpamAssassin/PerMsgStatus.pm
@@ -2910,7 +2910,7 @@ sub add_uri_detail_list {
     }
 
     my $dns_max_cname_cache = $self->{main}->{conf}->{dns_max_cname_cache};
-    if($self->is_dns_available() and (not defined $self->{dns_cname_cache} or scalar %{$self->{dns_cname_cache}} < $dns_max_cname_cache)) {
+    if($self->is_dns_available() and ($dns_max_cname_cache > 0) and (not defined $self->{dns_cname_cache} or scalar %{$self->{dns_cname_cache}} < $dns_max_cname_cache)) {
       # XXX we cannot call bgsend_and_start_lookup,
       # otherwise get_uri_detail_list() might not
       # return domains extracted from CNAME dns queries