Mercurial > dnsbl

changeset 175:e726e1a61ef9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
allow manual whitelisting with stamp 1 to remove a whitelist entry
author carl
date Sun, 23 Sep 2007 14:08:17 -0700
parents da0c41b9f672
children 4ec928b24bab
files dnsbl.conf src/context.cpp xml/dnsbl.in
diffstat 3 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- 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 {
--- 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);
 				}
 			}
--- 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 {