summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Sulfrian <alexander@sulfrian.net>2011-10-11 21:03:46 +0200
committerAlexander Sulfrian <alexander@sulfrian.net>2011-10-11 21:03:46 +0200
commitd82c1cc23febff6678bea5e7434f2735b0f29c4e (patch)
tree5519aac09b2cff3dc3bda7d922332d96221adbbd
parentb57599ead428ebc18cc297843d5d5950cd765b7a (diff)
downloadsites-d82c1cc23febff6678bea5e7434f2735b0f29c4e.tar.gz
sites-d82c1cc23febff6678bea5e7434f2735b0f29c4e.tar.bz2
sites-d82c1cc23febff6678bea5e7434f2735b0f29c4e.zip
fixed listname checking
-rw-r--r--config.py2
-rw-r--r--util.py3
2 files changed, 2 insertions, 3 deletions
diff --git a/config.py b/config.py
index 7224730..aef66a1 100644
--- a/config.py
+++ b/config.py
@@ -28,9 +28,7 @@ except:
reserved_names = [
r'-admin$',
r'-bounces$',
- r'-bounces~.*$',
r'-confirm$',
- r'-confirm~.*$',
r'-join$',
r'-leave$',
r'-owner$',
diff --git a/util.py b/util.py
index d3b7ee2..20ec9c3 100644
--- a/util.py
+++ b/util.py
@@ -3,6 +3,7 @@
import config
import web
+import re
from random import Random
from Mailman import MailList, Errors, UserDesc
@@ -30,8 +31,8 @@ def validate_listname(name):
for regex in config.reserved_names:
if re.search(regex, name):
return False
- return True
+ return True
def create_list(listname, listadmin, passwd=None):
if passwd == None: