Don't disable gossip for temporary error.

This commit is contained in:
Stuart Gathman
2007-04-02 18:37:25 +00:00
parent 1da5ca54b5
commit 20a875b84d
3 changed files with 15 additions and 9 deletions
+12 -6
View File
@@ -1,6 +1,10 @@
#!/usr/bin/env python #!/usr/bin/env python
# A simple milter that has grown quite a bit. # A simple milter that has grown quite a bit.
# $Log$ # $Log$
# Revision 1.102 2007/03/30 18:13:41 customdesigned
# Report bestguess and helo-spf as key-value pairs in Received-SPF
# instead of in their own headers.
#
# Revision 1.101 2007/03/29 03:06:10 customdesigned # Revision 1.101 2007/03/29 03:06:10 customdesigned
# Don't count DSN and unqualified MAIL FROM as internal_domain. # Don't count DSN and unqualified MAIL FROM as internal_domain.
# #
@@ -774,12 +778,14 @@ class bmsMilter(Milter.Milter):
qual = res qual = res
try: try:
umis = gossip.umis(domain+qual,self.id+time.time()) umis = gossip.umis(domain+qual,self.id+time.time())
res,hdr,val = gossip_node.query(umis,domain,qual,1) res = gossip_node.query(umis,domain,qual,1)
self.add_header(hdr,val) if res:
a = val.split(',') res,hdr,val = gossip_node.query(umis,domain,qual,1)
self.reputation = int(a[-2]) self.add_header(hdr,val)
self.confidence = int(a[-1]) a = val.split(',')
self.umis = umis self.reputation = int(a[-2])
self.confidence = int(a[-1])
self.umis = umis
except: except:
gossip = None gossip = None
raise raise
+2 -2
View File
@@ -239,8 +239,8 @@ everything up for you. For other systems:
How do I stop this behavior? How do I stop this behavior?
<p> A. The SPF response is controlled by <code>/etc/mail/access</code> <p> A. The SPF response is controlled by <code>/etc/mail/access</code>
(actually the file you specify with <code>access_file</code> in (actually the file you specify with <code>access_file</code> in
the <code>[spf]</code> section of <code>pymilter.cfg</code>. Responses the <code>[spf]</code> section of <code>pymilter.cfg</code>).
are OK, CBV, and REJECT. CBV sends the DSN. Responses are OK, CBV, and REJECT. CBV sends the DSN.
<p> <p>
You can change the defaults. For instance, I have: You can change the defaults. For instance, I have:
<pre> <pre>
+1 -1
View File
@@ -20,7 +20,7 @@ ALT="Viewable With Any Browser" BORDER="0"></A>
Stuart D. Gathman</a><br> Stuart D. Gathman</a><br>
This web page is written by Stuart D. Gathman<br>and<br>sponsored by This web page is written by Stuart D. Gathman<br>and<br>sponsored by
<a href="http://www.bmsi.com">Business Management Systems, Inc.</a> <br> <a href="http://www.bmsi.com">Business Management Systems, Inc.</a> <br>
Last updated Dec 29, 2005</h4> Last updated Mar 30, 2007</h4>
See the <a href="faq.html">FAQ</a> | <a href="http://sourceforge.net/project/showfiles.php?group_id=139894">Download now</a> | See the <a href="faq.html">FAQ</a> | <a href="http://sourceforge.net/project/showfiles.php?group_id=139894">Download now</a> |
<a href="http://bmsi.com/mailman/listinfo/pymilter">Subscribe to mailing list</a> | <a href="http://bmsi.com/mailman/listinfo/pymilter">Subscribe to mailing list</a> |