From 7ad9af1703e5762cc7cb4d2d02303975b2e6f67a Mon Sep 17 00:00:00 2001 From: Mark Sapiro Date: Sun, 22 Jun 2008 12:28:05 -0700 Subject: Another BounceRunner loop detection change (rev 1106 wasn't quite right). --- Mailman/Queue/BounceRunner.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'Mailman') diff --git a/Mailman/Queue/BounceRunner.py b/Mailman/Queue/BounceRunner.py index 6405c091..d219d6e9 100644 --- a/Mailman/Queue/BounceRunner.py +++ b/Mailman/Queue/BounceRunner.py @@ -209,8 +209,10 @@ class BounceRunner(Runner, BounceMixin): return # Is this a possible looping message sent directly to a list-bounces # address other than the site list? - # Use the From: because message may not have a unix_from. - if msg.get('from') == Utils.get_site_email(extra='bounces'): + # Check From: because unix_from might be VERP'd. + # Also, check the From: that Message.OwnerNotification uses. + if (msg.get('from') == + Utils.get_site_email(mlist.host_name, 'bounces')): # Just send it to the sitelist-owner address. If that bounces # we'll handle it above. outq.enqueue(msg, msgdata, -- cgit v1.2.3