Jim Ramsay <[EMAIL PROTECTED]> writes:
> Index: Pending.py
> ===================================================================
> RCS file: /cvsroot/tmda/tmda/TMDA/Pending.py,v
> retrieving revision 1.22
> diff -u -r1.22 Pending.py
> --- Pending.py 21 Aug 2003 19:18:31 -0000 1.22
> +++ Pending.py 5 Dec 2003 15:32:32 -0000
> @@ -428,7 +428,10 @@
> self.recipient = recipient
>
> def initMessage(self, recipient = None):
> - self.return_path = parseaddr(self.msgobj.get('return-path'))[1]
> + self.return_path = Util.confirm_append_address(
> + parseaddr(self.msgobj.get('x-primary-address'))[1],
> + parseaddr(self.msgobj.get('return-path'))[1] )
> + self.envelope_sender = parseaddr(self.msgobj.get('return-path'))[1]
> if not recipient and not self.recipient:
> self.recipient = self.msgobj.get('x-tmda-recipient')
> else:
> @@ -463,7 +466,7 @@
> self.msgobj['X-TMDA-Released'] = Util.unixdate()
> # Reinject the message to the original envelope recipient.
> Util.sendmail(Util.msg_as_string(self.msgobj),
> - self.recipient, self.return_path)
> + self.recipient, self.envelope_sender)
>
> def delete(self):
> """Delete a message from the pending queue."""
This looks good to me. I just updated Pending.py to fix another
problem, so you'll want to update from CVS before committing this.
Tim
_________________________________________________
tmda-workers mailing list ([EMAIL PROTECTED])
http://tmda.net/lists/listinfo/tmda-workers
