aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormsapiro <>2005-11-13 20:40:21 +0000
committermsapiro <>2005-11-13 20:40:21 +0000
commite5f82163fc13181c1e1423ffe9161e029591fb5f (patch)
tree60a0ae3f994d7143d6c0c537e5ab777643b76245
parent4229d22bceb4f9c3811efe597112e6ac7d1a9626 (diff)
downloadmailman2-e5f82163fc13181c1e1423ffe9161e029591fb5f.tar.gz
mailman2-e5f82163fc13181c1e1423ffe9161e029591fb5f.tar.xz
mailman2-e5f82163fc13181c1e1423ffe9161e029591fb5f.zip
Use original_sender put in msgdata by CookHeaders.py if it's available
-rw-r--r--Mailman/Handlers/SMTPDirect.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/Mailman/Handlers/SMTPDirect.py b/Mailman/Handlers/SMTPDirect.py
index d631c80c..0d93073d 100644
--- a/Mailman/Handlers/SMTPDirect.py
+++ b/Mailman/Handlers/SMTPDirect.py
@@ -140,7 +140,7 @@ def process(mlist, msg, msgdata):
# If we're VERPing, it doesn't matter because bulkdeliver is working
# on a copy, but otherwise msg gets changed. If the list is anonymous,
# the original sender is long gone, but Cleanse.py has logged it.
- origsender = msg.get_sender()
+ origsender = msgdata.get('original_sender', msg.get_sender())
# `undelivered' is a copy of chunks that we pop from to do deliveries.
# This seems like a good tradeoff between robustness and resource
# utilization. If delivery really fails (i.e. qfiles/shunt type