svn commit: r464886 - in /spamassassin/trunk/lib/Mail/SpamAssassin/Plugin: HeaderEval.pm RelayEval.pm

[jm...@apache.org]

Author: jm
Date: Tue Oct 17 03:06:18 2006
New Revision: 464886

URL: http://svn.apache.org/viewvc?view=rev&rev=464886
Log:
silence more over-verbose debugs; eval-rule noise can be recovered, if you still want it in future, by using '-Deval' switch

Modified:
    spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/HeaderEval.pm
    spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/RelayEval.pm

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/HeaderEval.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/HeaderEval.pm?view=diff&rev=464886&r1=464885&r2=464886
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/HeaderEval.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/HeaderEval.pm Tue Oct 17 03:06:18 2006
@@ -852,10 +852,10 @@
     foreach $rcvd (@local) {
       if ($rcvd =~ m/(\s.?\d+ \S\S\S \d+ \d+:\d+:\d+ \S+)/) {
 	my $date = $1;
-	dbg("eval: trying Received fetchmail header date for real time: $date");
+        dbg2("eval: trying Received fetchmail header date for real time: $date");
 	my $time = Mail::SpamAssassin::Util::parse_rfc822_date($date);
 	if (defined($time) && (time() >= $time)) {
-	  dbg("eval: time_t from date=$time, rcvd=$date");
+          dbg2("eval: time_t from date=$time, rcvd=$date");
 	  push @fetchmail_times, $time;
 	}
       }
@@ -872,10 +872,10 @@
   foreach $rcvd (@received) {
     if ($rcvd =~ m/(\s.?\d+ \S\S\S \d+ \d+:\d+:\d+ \S+)/) {
       my $date = $1;
-      dbg("eval: trying Received header date for real time: $date");
+      dbg2("eval: trying Received header date for real time: $date");
       my $time = Mail::SpamAssassin::Util::parse_rfc822_date($date);
       if (defined($time)) {
-	dbg("eval: time_t from date=$time, rcvd=$date");
+        dbg2("eval: time_t from date=$time, rcvd=$date");
 	push @header_times, $time;
       }
     }
@@ -1127,6 +1127,15 @@
   }
 
   return 0;
+}
+
+###########################################################################
+
+# support eval-test verbose debugs using "-Deval"
+sub dbg2 {
+  if (would_log('dbg', 'eval') == 2) {
+    dbg(@_);
+  }
 }
 
 1;

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/RelayEval.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/RelayEval.pm?view=diff&rev=464886&r1=464885&r2=464886
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/RelayEval.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/RelayEval.pm Tue Oct 17 03:06:18 2006
@@ -162,7 +162,7 @@
       if ($pms->is_dns_available()) {
 	my $vrdns = $pms->lookup_ptr ($relay->{ip});
 	if (defined $vrdns && $vrdns ne $claimed) {
-	  dbg("eval: rdns/helo mismatch: helo=$relay->{helo} ".	
+	  dbg2("eval: rdns/helo mismatch: helo=$relay->{helo} ".	
 		"claimed-rdns=$claimed true-rdns=$vrdns");
 	  return 1;
 	  # TODO: instead, we should set a flag and check it later for
@@ -182,7 +182,7 @@
       }
 
       # otherwise there *is* a mismatch
-      dbg("eval: rdns/helo mismatch: helo=$relay->{helo} rdns=$claimed");
+      dbg2("eval: rdns/helo mismatch: helo=$relay->{helo} rdns=$claimed");
       return 1;
     }
   }
@@ -351,7 +351,7 @@
 
       # ok, let's catch the case where there's *no* reverse DNS there either
       if ($no_rdns) {
-	dbg("eval: Received: no rDNS for dotcom HELO: from=$from_host HELO=$helo_host");
+	dbg2("eval: Received: no rDNS for dotcom HELO: from=$from_host HELO=$helo_host");
 	$pms->{no_rdns_dotcom_helo} = 1;
       }
     }
@@ -433,7 +433,7 @@
     my $hlo = $helo[$i];
     my $by = $by[$i];
 
-    dbg("eval: forged-HELO: from=".(defined $frm ? $frm : "(undef)").
+    dbg2("eval: forged-HELO: from=".(defined $frm ? $frm : "(undef)").
 			" helo=".(defined $hlo ? $hlo : "(undef)").
 			" by=".(defined $by ? $by : "(undef)"));
 
@@ -447,7 +447,7 @@
 		&& $frm =~ /^\w+(?:[\w.-]+\.)+\w+$/
 		&& $frm ne $hlo && !helo_forgery_whitelisted($frm, $hlo))
     {
-      dbg("eval: forged-HELO: mismatch on HELO: '$hlo' != '$frm'");
+      dbg2("eval: forged-HELO: mismatch on HELO: '$hlo' != '$frm'");
       $pms->{mismatch_helo}++;
     }
 
@@ -466,7 +466,7 @@
 		$hclassb ne $fclassb &&
 		!($hlo =~ /$IP_PRIVATE/o))
 	{
-	  dbg("eval: forged-HELO: massive mismatch on IP-addr HELO: '$hlo' != '$fip'");
+	  dbg2("eval: forged-HELO: massive mismatch on IP-addr HELO: '$hlo' != '$fip'");
 	  $pms->{mismatch_ip_helo}++;
 	}
       }
@@ -477,9 +477,18 @@
 		&& $prev =~ /^\w+(?:[\w.-]+\.)+\w+$/
 		&& $by ne $prev && !helo_forgery_whitelisted($by, $prev))
     {
-      dbg("eval: forged-HELO: mismatch on from: '$prev' != '$by'");
+      dbg2("eval: forged-HELO: mismatch on from: '$prev' != '$by'");
       $pms->{mismatch_from}++;
     }
+  }
+}
+
+###########################################################################
+
+# support eval-test verbose debugs using "-Deval"
+sub dbg2 {
+  if (would_log('dbg', 'eval') == 2) {
+    dbg(@_);
   }
 }