You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by qu...@apache.org on 2004/08/26 20:12:50 UTC

svn commit: rev 37092 - spamassassin/trunk/lib/Mail/SpamAssassin

Author: quinlan
Date: Thu Aug 26 11:12:49 2004
New Revision: 37092

Modified:
   spamassassin/trunk/lib/Mail/SpamAssassin/Dns.pm
Log:
bug 3730: make DNS unavailable unless versions are high enough


Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Dns.pm
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Dns.pm	(original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Dns.pm	Thu Aug 26 11:12:49 2004
@@ -1211,7 +1211,25 @@
     dbg ("dns_available set to yes in config file, skipping test", "dnsavailable", -1);
     return $IS_DNS_AVAILABLE;
   }
-  
+
+  # Check version numbers - runtime check only
+  if (defined $Net::DNS::VERSION) {
+    if (Mail::SpamAssassin::Util::am_running_on_windows()) {
+      if ($Net::DNS::VERSION < 0.46) {
+	dbg("Net::DNS version is $Net::DNS::VERSION, but need 0.46 for Win32",
+	    "dnsavailable", -1);
+	return $IS_DNS_AVAILABLE;
+      }
+    }
+    else {
+      if ($Net::DNS::VERSION < 0.34) {
+	dbg("Net::DNS version is $Net::DNS::VERSION, but need 0.34",
+	    "dnsavailable", -1);
+	return $IS_DNS_AVAILABLE;
+      }
+    }
+  }
+
   goto done unless $self->load_resolver();
 
   if ($dnsopt =~ /test:\s+(.+)$/) {