X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=ud-mailgate;h=918f5d0654922e91ec4addd408a749f151b9facc;hb=91b47971e8bf4e0a786c718c2dba20027d96ace6;hp=b23e8a520d58d4bffbc4ac04c3bc36c97460a88c;hpb=1fba345532896a49d61b365dbbe5fa52135f2ab3;p=mirror%2Fuserdir-ldap.git

diff --git a/ud-mailgate b/ud-mailgate
index b23e8a5..918f5d0 100755
--- a/ud-mailgate
+++ b/ud-mailgate
@@ -42,14 +42,6 @@ ValidHostNames = [] # will be initialized in later
 SSHFingerprint = re.compile('^(\d+) ([0-9a-f\:]{47}|SHA256:[0-9A-Za-z/+]{43}) (.+)$')
 SSHRSA1Match = re.compile('^^(.* )?\d+ \d+ \d+')
 
-GenderTable = {"male": '1',
-	       "1": '1',
-	       "female": '2',
-	       "2": '2',
-	       "unspecified": '9',
-	       "9": '9',
-};
-
 ArbChanges = {"c": "..",
 	      "l": ".*",
 	      "facsimileTelephoneNumber": ".*",
@@ -70,7 +62,6 @@ ArbChanges = {"c": "..",
 	      "mailCallout": "^(TRUE|FALSE)$",
 	      "mailDefaultOptions": "^(TRUE|FALSE)$",
 	      "VoIP": ".*",
-	      "gender": "^(1|2|9|male|female|unspecified)$",
          "mailContentInspectionAction": "^(reject|blackhole|markup)$",
 };
 
@@ -184,10 +175,6 @@ def DoArbChange(Str,Attrs):
       raise UDFormatError, "Item does not match the required format"+ArbChanges[attrName];
 
    value = G[1];
-   if attrName == 'gender':
-      if G[1] not in GenderTable:
-         raise UDFormatError, "Gender not found in table"
-      value = GenderTable[G[1]]
 
 #   if attrName == 'birthDate':
 #      (re.match("^([0-9]{4})([01][0-9])([0-3][0-9])$",G[1]) {
@@ -297,7 +284,7 @@ def DoSSH(Str, Attrs, badkeys, uid):
          if not machine_regex.match(m):
             return "machine specification for ssh key contains invalid characters"
          if m not in ValidHostNames:
-            return "unknown machine used in allowed_hosts stanza for ssh keys"
+            return "unknown machine {} used in allowed_hosts stanza for ssh keys".format(m)
 
    (fd, path) = tempfile.mkstemp(".pub", "sshkeytry", "/tmp")
    f = open(path, "w")
@@ -372,7 +359,7 @@ def DoDNS(Str,Attrs,DnRecord):
    cnamerecord = re.match("^[-\w]+\s+IN\s+CNAME\s+([-\w.]+\.)$",Str,re.IGNORECASE)
    arecord     = re.match('^[-\w]+\s+IN\s+A\s+(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})$',Str,re.IGNORECASE)
    mxrecord    = re.match("^[-\w]+\s+IN\s+MX\s+(\d{1,3})\s+([-\w.]+\.)$",Str,re.IGNORECASE)
-   txtrecord   = re.match("^[-\w]+\s+IN\s+TXT\s+([-\d. a-z\t<>@]+)", Str, re.IGNORECASE)
+   txtrecord   = re.match("^[-\w]+\s+IN\s+TXT\s+([-\d. a-z\t<>@:]+)", Str, re.IGNORECASE)
    #aaaarecord  = re.match('^[-\w]+\s+IN\s+AAAA\s+((?:[0-9a-f]{1,4})(?::[0-9a-f]{1,4})*(?::(?:(?::[0-9a-f]{1,4})*|:))?)$',Str,re.IGNORECASE)
    aaaarecord  = re.match('^[-\w]+\s+IN\s+AAAA\s+([A-F0-9:]{2,39})$',Str,re.IGNORECASE)