From e5f82163fc13181c1e1423ffe9161e029591fb5f Mon Sep 17 00:00:00 2001
From: msapiro <>
Date: Sun, 13 Nov 2005 20:40:21 +0000
Subject: Use original_sender put in msgdata by CookHeaders.py if it's
 available

---
 Mailman/Handlers/SMTPDirect.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'Mailman/Handlers/SMTPDirect.py')

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
-- 
cgit v1.2.3