ud-generate: Allow more than one email address in userForward. Quite useful for...

diff --git a/debian/changelog b/debian/changelog
index d62afbb..61579ac 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -55,7 +55,8 @@ userdir-ldap (0.3.80) UNRELEASED; urgency=low
     ldap has not.
   * userdir-ldap-slapd.conf.in: explicitly list readable attributes.
     End with 'by * none'.
-
+  * ud-generate: Allow more than one email address in userForward.  Quite
+    useful for role accounts.
 
   [ Stephen Gran ]
   * Fix deprecation warnings for sha module by using hashlib module instead

diff --git a/ud-generate b/ud-generate
index 44bccc4..858d736 100755 (executable)
--- a/ud-generate
+++ b/ud-generate
@@ -62,7 +62,7 @@ SubGroupMap = None
 
 UUID_FORMAT = '[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}'
 
-EmailCheck = re.compile("^([^ <>@]+@[^ ,<>@]+)?$")
+EmailCheck = re.compile("^([^ <>@]+@[^ ,<>@]+)(,\s*([^ <>@]+@[^ ,<>@]+))*$")
 BSMTPCheck = re.compile(".*mx 0 (master)\.debian\.org\..*",re.DOTALL)
 PurposeHostField = re.compile(r".*\[\[([\*\-]?[a-z0-9.\-]*)(?:\|.*)?\]\]")
 IsV6Addr = re.compile("^[a-fA-F0-9:]+$")