# HG changeset patch
# User carl
# Date 1190581697 25200
# Node ID e726e1a61ef9a94183a38f153b3054a8e5106fef
# Parent  da0c41b9f672c1d4fdd9d1b826365b32c7e8f3dd
allow manual whitelisting with stamp 1 to remove a whitelist entry


diff -r da0c41b9f672 -r e726e1a61ef9 dnsbl.conf
--- a/dnsbl.conf	Sun Sep 23 11:20:12 2007 -0700
+++ b/dnsbl.conf	Sun Sep 23 14:08:17 2007 -0700
@@ -52,7 +52,7 @@
         spamassassin 5;
     };
 
-    generic "(^|[.-])(h(ost|))?([0-9]{1,3}[.-](Red-|dynamic[.-])?){4}"
+    generic "(^|[.-])(ppp|h|host)?([0-9]{1,3}[.-](Red-|dynamic[.-])?){4}"
             "your mail server %s seems to have a generic name";
 
     env_to {
diff -r da0c41b9f672 -r e726e1a61ef9 src/context.cpp
--- a/src/context.cpp	Sun Sep 23 11:20:12 2007 -0700
+++ b/src/context.cpp	Sun Sep 23 14:08:17 2007 -0700
@@ -452,7 +452,7 @@
 				}
 				else {
 					time_t wh = (*i).second;
-					if (when > wh) (*i).second = when;
+					if ((when == 1) || (when > wh)) (*i).second = when;
 					free(who);
 				}
 			}
diff -r da0c41b9f672 -r e726e1a61ef9 xml/dnsbl.in
--- a/xml/dnsbl.in	Sun Sep 23 11:20:12 2007 -0700
+++ b/xml/dnsbl.in	Sun Sep 23 14:08:17 2007 -0700
@@ -680,7 +680,7 @@
         spamassassin 5;
     };
 
-    generic "(^|[.-])(h(ost|))?([0-9]{1,3}[.-](Red-|dynamic[.-])?){4}"
+    generic "(^|[.-])(ppp|h|host)?([0-9]{1,3}[.-](Red-|dynamic[.-])?){4}"
             "your mail server %s seems to have a generic name";
 
     env_to {