CVS: tmda/bin ChangeLog,1.146,1.147 tmda-rfilter,1.6,1.7

Update of /cvsroot/tmda/tmda/bin
In directory usw-pr-cvs1:/tmp/cvs-serv13483/bin

Modified Files:
        ChangeLog tmda-rfilter 
Log Message:
When determining the envelope recipient of an incoming message,
tmda-rfilter no longer looks for an `X-*-Originally-To' header by
default.  The problem with doing this is that if the message already
contains such a header, the envelope recipient would not be correct,
and therefore the confirmation process would fail because of the
invalid confirmation addresses.

Users who want to retain this feature now set RECIPIENT_HEADER in
their tmdarc, and are warned to overwrite/replace this header in case
of a clash.

Problem initially reported by Drew Raines in
<20020109203350.GI27708@xxxxxxxxxxxxxxxxxxxxx> on tmda-workers.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/tmda/tmda/bin/ChangeLog,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -r1.146 -r1.147
--- ChangeLog   2002/01/09 23:52:25     1.146
+++ ChangeLog   2002/01/11 20:51:33     1.147
@@ -1,3 +1,9 @@
+2002-01-11  Jason R. Mastaler  <jasonrm@xxxxxxxxxxxxxxxxxxxxxxxxxx>
+
+       * tmda-rfilter (envelope_recipient): We no longer look for an
+       X-*-Originally-To header by default.  Instead, we look for the
+       header contained in RECIPIENT_HEADER if it's set by the user.
+
 2002-01-09  Jason R. Mastaler  <jasonrm@xxxxxxxxxxxxxxxxxxxxxxxxxx>
 
        * tmda-rfilter (list_headers): Add `Mailing-List' to the list of

Index: tmda-rfilter
===================================================================
RCS file: /cvsroot/tmda/tmda/bin/tmda-rfilter,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- tmda-rfilter        2002/01/09 23:52:25     1.6
+++ tmda-rfilter        2002/01/11 20:51:33     1.7
@@ -138,9 +138,11 @@
 if envelope_sender == None:
     raise Errors.MissingEnvironmentVariable('SENDER')
 # RECIPIENT is the envelope recipient address.
-# Use the X-TMDA-Originally-To header if it exists.
-envelope_recipient = (message_headers.getheader('x-tmda-originally-to')
-                      or os.environ.get('RECIPIENT'))
+# Use Defaults.RECIPIENT_HEADER instead if set.
+recipient_header = None
+if Defaults.RECIPIENT_HEADER:
+    recipient_header = message_headers.getheader(Defaults.RECIPIENT_HEADER)
+envelope_recipient = (recipient_header or os.environ.get('RECIPIENT'))
 if envelope_recipient == None:
     raise Errors.MissingEnvironmentVariable('RECIPIENT')
 # EXT is the recipient address extension.

_______________________________________________
tmda-cvs mailing list
http://libertine.org/lists/listinfo/tmda-cvs