X-Git-Url: https://git.adam-barratt.org.uk/?p=mirror%2Fuserdir-ldap.git;a=blobdiff_plain;f=ud-generate;h=858d736cec157afb188bc15539527e6b9a7fd3d4;hp=44bccc42e774ee063107fb09802460605472b4f2;hb=c66b8117fef6f45e48c16490874dbbe34ec4e6e2;hpb=5bef88f3d6253fc7109d753e9a48284fd420f504 diff --git a/ud-generate b/ud-generate index 44bccc4..858d736 100755 --- 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:]+$")