diff --git a/bms.py b/bms.py index e7fc60a9b19c220931e87d4c7af18a2e27e2a9bd..d7d0c07859a7146c693e51b5c3bee55df395d258 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.71 2006/11/22 01:03:28 customdesigned +# Replace last use of deprecated rfc822 module. +# # Revision 1.70 2006/11/21 18:45:49 customdesigned # Update a use of deprecated rfc822. Recognize report-type=delivery-status # @@ -325,6 +328,7 @@ def read_config(list): if SES: ses = SES.new(secret=srs_secret,expiration=maxage) srs_domain = set(cp.getlist('srs','ses')) + srs_domain.update(cp.getlist('srs','srs')) else: srs_domain = set(cp.getlist('srs','srs')) srs_domain.update(cp.getlist('srs','sign')) @@ -1582,6 +1586,8 @@ class bmsMilter(Milter.Milter): try: msg.dump(out) out.seek(0) + # Since we wrote headers with '\n' (no CR), + # the following header/body split should always work. msg = out.read().split('\n\n',1)[-1] self.replacebody(msg) # feed modified message to sendmail if spam_checked: