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

diff --git a/ud-mailgate b/ud-mailgate
index fd70c37..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]) {