# HG changeset patch
# User carl
# Date 1160532736 25200
# Node ID ecb40aa3eaa5cef2495b17b5f087425b7a09b0b6
# Parent  b82e001466725013b9a422cfb2d6f189919faad1
require two periods for ip addresses


diff -r b82e00146672 -r ecb40aa3eaa5 ChangeLog
--- a/ChangeLog	Thu Sep 28 08:43:32 2006 -0700
+++ b/ChangeLog	Tue Oct 10 19:12:16 2006 -0700
@@ -1,5 +1,8 @@
     $Id$
 
+5.23 2006-10-10
+    Require two periods in ip addresses.
+
 5.22 2006-09-27
     Change syntax for default rate limit. Improve hourly reset of
     limits. Warning for rate limits in non default contexts to allow
diff -r b82e00146672 -r ecb40aa3eaa5 NEWS
--- a/NEWS	Thu Sep 28 08:43:32 2006 -0700
+++ b/NEWS	Tue Oct 10 19:12:16 2006 -0700
@@ -1,5 +1,6 @@
     $Id$
 
+5.23 2006-10-10 Require two periods in ip addresses
 5.22 2006-09-27 Cleanup rate limit code.
 5.21 2006-09-26 Add SMTP AUTH recipient rate limits
 5.20 2006-08-02 fully qualify all dns lookups; fix my_read() bug
diff -r b82e00146672 -r ecb40aa3eaa5 configure.in
--- a/configure.in	Thu Sep 28 08:43:32 2006 -0700
+++ b/configure.in	Tue Oct 10 19:12:16 2006 -0700
@@ -1,7 +1,7 @@
 AC_INIT(configure.in)
 
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(dnsbl,5.22)
+AM_INIT_AUTOMAKE(dnsbl,5.23)
 AC_PATH_PROGS(BASH, bash)
 
 AC_LANG_CPLUSPLUS
diff -r b82e00146672 -r ecb40aa3eaa5 src/context.cpp
--- a/src/context.cpp	Thu Sep 28 08:43:32 2006 -0700
+++ b/src/context.cpp	Tue Oct 10 19:12:16 2006 -0700
@@ -1,6 +1,6 @@
 /*
 
-Copyright (c) 2004 Carl Byington - 510 Software Group, released under
+Copyright (c) 2006 Carl Byington - 510 Software Group, released under
 the GPL version 2 or any later version at your choice available at
 http://www.fsf.org/licenses/gpl.txt
 
diff -r b82e00146672 -r ecb40aa3eaa5 src/context.h
--- a/src/context.h	Thu Sep 28 08:43:32 2006 -0700
+++ b/src/context.h	Tue Oct 10 19:12:16 2006 -0700
@@ -1,3 +1,11 @@
+/*
+
+Copyright (c) 2006 Carl Byington - 510 Software Group, released under
+the GPL version 2 or any later version at your choice available at
+http://www.fsf.org/licenses/gpl.txt
+
+*/
+
 #ifndef context_include
 #define context_include
 
diff -r b82e00146672 -r ecb40aa3eaa5 src/dnsbl.cpp
--- a/src/dnsbl.cpp	Thu Sep 28 08:43:32 2006 -0700
+++ b/src/dnsbl.cpp	Tue Oct 10 19:12:16 2006 -0700
@@ -1,6 +1,6 @@
 /*
 
-Copyright (c) 2004, 2005 Carl Byington - 510 Software Group, released
+Copyright (c) 2006 Carl Byington - 510 Software Group, released
 under the GPL version 2 or any later version at your choice available at
 http://www.fsf.org/licenses/gpl.txt
 
diff -r b82e00146672 -r ecb40aa3eaa5 src/dnsbl.h
--- a/src/dnsbl.h	Thu Sep 28 08:43:32 2006 -0700
+++ b/src/dnsbl.h	Tue Oct 10 19:12:16 2006 -0700
@@ -1,3 +1,11 @@
+/*
+
+Copyright (c) 2006 Carl Byington - 510 Software Group, released under
+the GPL version 2 or any later version at your choice available at
+http://www.fsf.org/licenses/gpl.txt
+
+*/
+
 #ifndef dnsbl_include
 #define dnsbl_include
 
diff -r b82e00146672 -r ecb40aa3eaa5 src/includes.h
--- a/src/includes.h	Thu Sep 28 08:43:32 2006 -0700
+++ b/src/includes.h	Tue Oct 10 19:12:16 2006 -0700
@@ -1,3 +1,11 @@
+/*
+
+Copyright (c) 2006 Carl Byington - 510 Software Group, released under
+the GPL version 2 or any later version at your choice available at
+http://www.fsf.org/licenses/gpl.txt
+
+*/
+
 #define VERIFY_DEBUG   1
 #define RESOLVER_DEBUG 1
 #undef	VERIFY_DEBUG
diff -r b82e00146672 -r ecb40aa3eaa5 src/scanner.cpp
--- a/src/scanner.cpp	Thu Sep 28 08:43:32 2006 -0700
+++ b/src/scanner.cpp	Tue Oct 10 19:12:16 2006 -0700
@@ -1,6 +1,6 @@
 /*
 
-Copyright (c) 2004 Carl Byington - 510 Software Group, released under
+Copyright (c) 2006 Carl Byington - 510 Software Group, released under
 the GPL version 2 or any later version at your choice available at
 http://www.fsf.org/licenses/gpl.txt
 
@@ -1215,7 +1215,8 @@
 			// have a period, so at least two components, and no empty components
 			in_addr ip;
 			if (inet_aton((const char*)pending, &ip))
-				memory->new_url((char*)pending);
+				// have an ip address if at least two periods
+				if (p1 != p2) memory->new_url((char*)pending);
 			else {
 				for (int i=0; i<count; i++) pending[i] = tolower(pending[i]);
 				// is last component a tld?
diff -r b82e00146672 -r ecb40aa3eaa5 src/scanner.h
--- a/src/scanner.h	Thu Sep 28 08:43:32 2006 -0700
+++ b/src/scanner.h	Tue Oct 10 19:12:16 2006 -0700
@@ -1,3 +1,11 @@
+/*
+
+Copyright (c) 2006 Carl Byington - 510 Software Group, released under
+the GPL version 2 or any later version at your choice available at
+http://www.fsf.org/licenses/gpl.txt
+
+*/
+
 #ifndef scanner_include
 #define scanner_include
 
diff -r b82e00146672 -r ecb40aa3eaa5 src/test.cpp
--- a/src/test.cpp	Thu Sep 28 08:43:32 2006 -0700
+++ b/src/test.cpp	Tue Oct 10 19:12:16 2006 -0700
@@ -1,6 +1,6 @@
 /*
 
-Copyright (c) 2004 Carl Byington - 510 Software Group, released under
+Copyright (c) 2006 Carl Byington - 510 Software Group, released under
 the GPL version 2 or any later version at your choice available at
 http://www.fsf.org/licenses/gpl.txt
 
diff -r b82e00146672 -r ecb40aa3eaa5 src/tokenizer.cpp
--- a/src/tokenizer.cpp	Thu Sep 28 08:43:32 2006 -0700
+++ b/src/tokenizer.cpp	Tue Oct 10 19:12:16 2006 -0700
@@ -1,6 +1,6 @@
 /*
 
-Copyright (c) 2004 Carl Byington - 510 Software Group, released under
+Copyright (c) 2006 Carl Byington - 510 Software Group, released under
 the GPL version 2 or any later version at your choice available at
 http://www.fsf.org/licenses/gpl.txt
 
diff -r b82e00146672 -r ecb40aa3eaa5 src/tokenizer.h
--- a/src/tokenizer.h	Thu Sep 28 08:43:32 2006 -0700
+++ b/src/tokenizer.h	Tue Oct 10 19:12:16 2006 -0700
@@ -1,3 +1,11 @@
+/*
+
+Copyright (c) 2006 Carl Byington - 510 Software Group, released under
+the GPL version 2 or any later version at your choice available at
+http://www.fsf.org/licenses/gpl.txt
+
+*/
+
 #ifndef tokenizer_include
 #define tokenizer_include