# HG changeset patch
# User carl
# Date 1143308828 28800
# Node ID 05ae49d378965e38f9a179a324430b8e0eacc530
# Parent  8b1562482b29799d598a4498d1cf859e9d51cdeb
don't do dnsbl lookups on rfc1918 address space


diff -r 8b1562482b29 -r 05ae49d37896 ChangeLog
--- a/ChangeLog	Thu Mar 16 15:20:37 2006 -0800
+++ b/ChangeLog	Sat Mar 25 09:47:08 2006 -0800
@@ -1,5 +1,8 @@
     $Id$
 
+5.17 2006-03-25
+    never ask dns blacklists about rfc1918 address space.
+
 5.16 2006-03-16
     bug fix - the smtp error message for uribl filtering needs to
     reference the host name, not the ip address.
diff -r 8b1562482b29 -r 05ae49d37896 NEWS
--- a/NEWS	Thu Mar 16 15:20:37 2006 -0800
+++ b/NEWS	Sat Mar 25 09:47:08 2006 -0800
@@ -1,5 +1,6 @@
     $Id$
 
+5.17 2006-03-25 never ask dns blacklists about rfc1918 address space
 5.16 2006-03-16 bug fix, smtp error message for uribl filtering needs host name, not ip address
 5.15 2006-03-15 bug fix, failed to set reason code when rejecting mail from content filtering
 5.14 2006-03-13 fix typo in default config and documentation for using multi.surbl.org
diff -r 8b1562482b29 -r 05ae49d37896 configure.in
--- a/configure.in	Thu Mar 16 15:20:37 2006 -0800
+++ b/configure.in	Sat Mar 25 09:47:08 2006 -0800
@@ -1,7 +1,7 @@
 AC_INIT(configure.in)
 
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(dnsbl,5.16)
+AM_INIT_AUTOMAKE(dnsbl,5.17)
 AC_PATH_PROGS(BASH, bash)
 
 AC_LANG_CPLUSPLUS
diff -r 8b1562482b29 -r 05ae49d37896 src/dnsbl.cpp
--- a/src/dnsbl.cpp	Thu Mar 16 15:20:37 2006 -0800
+++ b/src/dnsbl.cpp	Sat Mar 25 09:47:08 2006 -0800
@@ -610,6 +610,9 @@
 	// make a dns question
 	const u_char *src = (const u_char *)&ip;
 	if (src[0] == 127) return false;	// don't do dns lookups on localhost
+	if (src[0] == 10)  return false;	// don't do dns lookups on rfc1918 space
+	if ((src[0] == 192) && (src[1] == 168)) return false;
+	if ((src[0] == 172) && (16 <= src[1]) && (src[1] <= 31)) return false;
 #ifdef NS_MAXDNAME
 	char question[NS_MAXDNAME];
 #else