diff options
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/mailowner | 14 | ||||
| -rwxr-xr-x | scripts/owner | 14 |
2 files changed, 22 insertions, 6 deletions
diff --git a/scripts/mailowner b/scripts/mailowner index a302b3ae8..7ed7ba8f9 100755 --- a/scripts/mailowner +++ b/scripts/mailowner @@ -61,9 +61,17 @@ def main(): # could take a long time to acquire the lock. This way we're fairly safe # against catastrophe at the expense of more disk I/O. # - # The `toadmin' flag is a message to qrunner that an alternative route - # should be taken for this message. - msg.Enqueue(mlist, toadmin=1) + # Try to figure out if the message came to the listname-admin@ or + # listname-owner@ address. Ideally these would get delivered to different + # programs, but for backwards compatibility, they both get delivered to + # mailowner. We don't want -owner messages to get processed by the bounce + # processor. + # + # See cron/qrunner for the paths these to flagged messages take. + if msg.get('to') == mlist.GetOwnerEmail(): + msg.Enqueue(mlist, toowner=1) + else: + msg.Enqueue(mlist, toadmin=1) diff --git a/scripts/owner b/scripts/owner index a302b3ae8..7ed7ba8f9 100755 --- a/scripts/owner +++ b/scripts/owner @@ -61,9 +61,17 @@ def main(): # could take a long time to acquire the lock. This way we're fairly safe # against catastrophe at the expense of more disk I/O. # - # The `toadmin' flag is a message to qrunner that an alternative route - # should be taken for this message. - msg.Enqueue(mlist, toadmin=1) + # Try to figure out if the message came to the listname-admin@ or + # listname-owner@ address. Ideally these would get delivered to different + # programs, but for backwards compatibility, they both get delivered to + # mailowner. We don't want -owner messages to get processed by the bounce + # processor. + # + # See cron/qrunner for the paths these to flagged messages take. + if msg.get('to') == mlist.GetOwnerEmail(): + msg.Enqueue(mlist, toowner=1) + else: + msg.Enqueue(mlist, toadmin=1) |