summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbwarsaw2002-10-19 17:36:28 +0000
committerbwarsaw2002-10-19 17:36:28 +0000
commit67918cabeac22b1b3882b98a857dd931bda5dd66 (patch)
tree77e80b7382e31cc299331ce8f14f0f4cf215eaf1
parent9ab56078cdde2bd09bc1c01dc930c4d9356cb830 (diff)
downloadmailman-67918cabeac22b1b3882b98a857dd931bda5dd66.tar.gz
mailman-67918cabeac22b1b3882b98a857dd931bda5dd66.tar.zst
mailman-67918cabeac22b1b3882b98a857dd931bda5dd66.zip
-rw-r--r--Mailman/Queue/NewsRunner.py8
1 files changed, 7 insertions, 1 deletions
diff --git a/Mailman/Queue/NewsRunner.py b/Mailman/Queue/NewsRunner.py
index c08283932..0439f0e15 100644
--- a/Mailman/Queue/NewsRunner.py
+++ b/Mailman/Queue/NewsRunner.py
@@ -85,6 +85,13 @@ class NewsRunner(Runner):
def prepare_message(mlist, msg, msgdata):
+ # If the newsgroup is moderated, we need to add this header for the Usenet
+ # software to accept the posting, and not forward it on to the n.g.'s
+ # moderation address. The posting would not have gotten here if it hadn't
+ # already been approved. 1 == open list, mod n.g., 2 == moderated
+ if mlist.news_moderation in (1, 2):
+ del msg['approved']
+ msg['Approved'] = mlist.GetListEmail()
# Should we restore the original, non-prefixed subject for gatewayed
# messages?
origsubj = msgdata.get('origsubj')
@@ -129,7 +136,6 @@ def prepare_message(mlist, msg, msgdata):
# Lines: is useful
if msg['Lines'] is None:
# BAW: is there a better way?
- it = email.Iterators.body_line_iterator(msg)
count = len(list(email.Iterators.body_line_iterator(msg)))
msg['Lines'] = str(count)
# Massage the message headers by remove some and rewriting others. This