From 0d1f2b7f4db3e778c76f160418c1b5244d21ca33 Mon Sep 17 00:00:00 2001
From: Stuart Gathman <stuart@gathman.org>
Date: Thu, 9 Oct 2008 00:55:13 +0000
Subject: [PATCH] Don't reset greylist timer on early retries.

---
 Milter/greylist.py | 5 +++--
 bms.py             | 6 +++++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/Milter/greylist.py b/Milter/greylist.py
index 6ff1d84..67c44d6 100644
--- a/Milter/greylist.py
+++ b/Milter/greylist.py
@@ -52,8 +52,9 @@ class Greylist(object):
           r = Record()
         elif now < r.firstseen + self.greylist_time:
           # still greylisted
-          log.debug('Reset greylist: %s',key)
-          r = Record()
+          log.debug('Early greylist: %s',key)
+          #r = Record()
+          r.lastseen = now
         elif r.cnt or now < r.firstseen + self.greylist_expire:
           # in greylist window or active
           r.lastseen = now
diff --git a/bms.py b/bms.py
index e38330e..8dcaf3b 100644
--- a/bms.py
+++ b/bms.py
@@ -1,6 +1,9 @@
 #!/usr/bin/env python
 # A simple milter that has grown quite a bit.
 # $Log$
+# Revision 1.131  2008/10/08 04:57:28  customdesigned
+# Greylisting
+#
 # Revision 1.130  2008/10/02 03:19:00  customdesigned
 # Delay strike3 REJECT and don't reject if whitelisted.
 # Recognize vacation messages as autoreplies.
@@ -765,6 +768,7 @@ class bmsMilter(Milter.Milter):
         if ip not in banned_ips:
           banned_ips.add(ip)
           print >>open('banned_ips','a'),self.connectip
+          self.log("BANNED IP:",self.connectip)
       except: pass
     return Milter.REJECT
 
@@ -916,7 +920,7 @@ class bmsMilter(Milter.Milter):
         or domain in blacklist:
       # FIXME: don't use cbv_cache for blacklist if policy is 'OK'
       if not self.internal_connection:
-        self.offense()
+        self.offense(inc=2)
         if not dspam_userdir:
           if domain in blacklist:
             self.log('REJECT: BLACKLIST',self.canon_from)