From f9ed6f7194318bc5e3dec70e98a240276495f477 Mon Sep 17 00:00:00 2001
From: Stuart Gathman <stuart@gathman.org>
Date: Tue, 9 Sep 2008 23:24:56 +0000
Subject: [PATCH] Never ban a trusted relay.

---
 TODO   | 3 +++
 bms.py | 5 ++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/TODO b/TODO
index d094ba1..a13b74d 100644
--- a/TODO
+++ b/TODO
@@ -1,3 +1,6 @@
+Add postmaster option or general rcpt list to dsn.  Can send dsn to
+user and postmaster on the same connection.
+
 Check ESMTP NOTIFY before sending real DSNs.  Just use CBV if DSNs are
 not wanted.
 
diff --git a/bms.py b/bms.py
index c6635e2..2672801 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.128  2008/09/09 23:08:16  customdesigned
+# Wasn't reading banned_ips
+#
 # Revision 1.127  2008/08/25 18:32:22  customdesigned
 # Handle missing gossip_node so self tests pass.
 #
@@ -732,7 +735,7 @@ class bmsMilter(Milter.Milter):
 
   def offense(self,inc=1):
     self.offenses += inc
-    if self.offenses > 3:
+    if self.offenses > 3 and not self.trusted_relay:
       try:
         ip = addr2bin(self.connectip)
         if ip not in banned_ips: