summaryrefslogtreecommitdiff
path: root/src/mailman/rules/moderation.py
diff options
context:
space:
mode:
authorBarry Warsaw2014-03-15 15:13:46 -0400
committerBarry Warsaw2014-03-15 15:13:46 -0400
commit547d6b4c53cf9b893571706b8b0bee386b1dd043 (patch)
treeb99d52c50f365644612e301175c5dc73dd150165 /src/mailman/rules/moderation.py
parentb2212b052aa80376e0a42aaee87306dd43fe4608 (diff)
downloadmailman-547d6b4c53cf9b893571706b8b0bee386b1dd043.tar.gz
mailman-547d6b4c53cf9b893571706b8b0bee386b1dd043.tar.zst
mailman-547d6b4c53cf9b893571706b8b0bee386b1dd043.zip
Diffstat (limited to 'src/mailman/rules/moderation.py')
-rw-r--r--src/mailman/rules/moderation.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/mailman/rules/moderation.py b/src/mailman/rules/moderation.py
index 153042ca9..46ed242fa 100644
--- a/src/mailman/rules/moderation.py
+++ b/src/mailman/rules/moderation.py
@@ -87,6 +87,10 @@ class NonmemberModeration:
assert address is not None, (
'Posting address is not registered: {0}'.format(sender))
mlist.subscribe(address, MemberRole.nonmember)
+ ## # If a member is found, the member-moderation rule takes precedence.
+ for sender in msg.senders:
+ if mlist.members.get_member(sender) is not None:
+ return False
# Do nonmember moderation check.
for sender in msg.senders:
nonmember = mlist.nonmembers.get_member(sender)