X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=ud-mailgate;h=31aa9c1ba0d15d5df7d5c2d8b5845f694e4921af;hb=0d0ec9c38991f84768628eee0de17888f29d48ea;hp=3ca7f817faf8a6d3a4f510f15392fa5e5766dc62;hpb=25e44ab9788aeb949e3dd5143a4f52f1c076ee1b;p=mirror%2Fuserdir-ldap.git

diff --git a/ud-mailgate b/ud-mailgate
index 3ca7f81..31aa9c1 100755
--- a/ud-mailgate
+++ b/ud-mailgate
@@ -51,6 +51,7 @@ ArbChanges = {"c": "..",
 	      "facsimileTelephoneNumber": ".*",
 	      "telephoneNumber": ".*",
 	      "postalAddress": ".*",
+         "bATVToken": ".*",
 	      "postalCode": ".*",
               "loginShell": ".*",
               "emailForward": "^([^<>@]+@.+)?$",
@@ -63,8 +64,10 @@ ArbChanges = {"c": "..",
               "mailDisableMessage": ".*",
 	      "mailGreylisting": "^(TRUE|FALSE)$",
 	      "mailCallout": "^(TRUE|FALSE)$",
+	      "mailDefaultOptions": "^(TRUE|FALSE)$",
 	      "VoIP": ".*",
 	      "gender": "^(1|2|9|male|female|unspecified)$",
+         "mailContentInspectionAction": "^(reject|blackhole|markup)$",
 };
 
 DelItems = {"c": None,
@@ -72,6 +75,7 @@ DelItems = {"c": None,
             "facsimileTelephoneNumber": None,
             "telephoneNumber": None,
             "postalAddress": None,
+            "bATVToken": None,
             "postalCode": None,
             "emailForward": None,
             "ircNick": None,
@@ -91,7 +95,9 @@ DelItems = {"c": None,
             "mailRHSBL": None,
             "mailWhitelist": None,
             "mailDisableMessage": None,
+            "mailDefaultOptions": None,
             "VoIP": None,
+            "mailContentInspectionAction": None,
             };