X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=ud-generate;h=b20e6bb1756f0cdb7d5b90fcc85638e8202f9ec0;hb=db36cbb61b95f316e9f9bc0d89aea2d3bef3dc54;hp=201f0e2d27d58d6322c02f7b386116a58134ce03;hpb=564435f0ad9477a23251cbf4c13e21af5c00702c;p=mirror%2Fuserdir-ldap.git

diff --git a/ud-generate b/ud-generate
index 201f0e2..b20e6bb 100755
--- a/ud-generate
+++ b/ud-generate
@@ -10,7 +10,7 @@ GroupIDMap = {};
 Allowed = None;
 CurrentHost = "";
 
-EmailCheck = re.compile("^([^<>@]+@.+)?$");
+EmailCheck = re.compile("^([^ <>@]+@[^ ,<>@]+)?$");
 
 def Sanitize(Str):
   return string.translate(Str,string.maketrans("\n\r\t","$$$"));
@@ -407,7 +407,7 @@ def GenDNS(l,File):
                F.write(Line);
 	       
 	       # Write some identication information
-               if string.lower(Split[2]) != "cname":
+               if string.lower(Split[2]) == "a":
    	          Line = "%s IN TXT \"%s\"\n"%(Split[0],EmailAddress(x));
                   for y in x[1]["keyfingerprint"]:
   	             Line = Line + "%s IN TXT \"PGP %s\"\n"%(Split[0],FormatPGPKey(y));