summaryrefslogtreecommitdiff
path: root/Mailman/MailCommandHandler.py
diff options
context:
space:
mode:
Diffstat (limited to 'Mailman/MailCommandHandler.py')
-rw-r--r--Mailman/MailCommandHandler.py15
1 files changed, 10 insertions, 5 deletions
diff --git a/Mailman/MailCommandHandler.py b/Mailman/MailCommandHandler.py
index efd13e3e6..fc8ab6f08 100644
--- a/Mailman/MailCommandHandler.py
+++ b/Mailman/MailCommandHandler.py
@@ -120,14 +120,19 @@ class MailCommandHandler:
else:
self.AddError("Subject line ignored: %s" % subject)
processed = {} # For avoiding redundancies.
- for line in lines:
- line = string.strip(line)
+ maxlines = mm_cfg.DEFAULT_MAIL_COMMANDS_MAX_LINES
+ for linecount in range(len(lines)):
+ line = string.strip(lines[linecount])
if not line:
continue
+ if linecount > maxlines:
+ self.AddToResponse("\n")
+ self.AddError("Maximum command lines (%d) encountered,"
+ " ignoring the rest..." % maxlines)
+ self.AddToResponse("<<< " + string.join(lines[linecount:],
+ "\n<<< "))
+ break
self.AddToResponse("\n>>>> %s" % line)
- line = string.strip(line)
- if not line:
- continue
args = string.split(line)
cmd = string.lower(args[0])
args = args[1:]