Initial support for BATV token storage.

diff --git a/debian/changelog b/debian/changelog
index 348eef9..53a625c 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 userdir-ldap (0.3.XX) Xnstable; urgency=low
 
+  [ Peter Palfrader ]
   * ud-generate: Make sure we only add people in gid 800 to debian-private.
     (DebianUsers was just a copy of PasswdAttrs.  So use PasswdAttrs in
      all the places that currently use DebianUsers.  Make a filtered list
@@ -8,7 +9,10 @@ userdir-ldap (0.3.XX) Xnstable; urgency=low
   * welcome-message-60000: improve wording of a sentence.  Sometimes less
     is more.
 
- -- Peter Palfrader <weasel@debian.org>  Sun, 25 Oct 2009 16:58:08 +0100
+  [ Stephen Gran ]
+  * Initial support for BATV token storage.
+
+ -- Stephen Gran <sgran@debian.org>  Sun, 15 Nov 2009 11:54:02 +0000
 
 userdir-ldap (0.3.73) unstable; urgency=low
 

diff --git a/ud-generate b/ud-generate
index bb923d4..3b86981 100755 (executable)
--- a/ud-generate
+++ b/ud-generate
@@ -1181,6 +1181,7 @@ for host in HostAttrs:
    DoLink(GlobalDir, OutDir, "mail-rhsbl")
    DoLink(GlobalDir, OutDir, "mail-whitelist")
    GenCDB(OutDir + "user-forward.cdb", filter(lambda x: IsInGroup(x), PasswdAttrs), 'emailForward')
+   GenCDB(OutDir + "batv-tokens.cdb", filter(lambda x: IsInGroup(x), PasswdAttrs), 'bATVToken')
 
    # Compatibility.
    DoLink(GlobalDir, OutDir, "forward-alias")

diff --git a/ud-mailgate b/ud-mailgate
index 533800c..b874f24 100755 (executable)
--- a/ud-mailgate
+++ b/ud-mailgate
@@ -51,6 +51,7 @@ ArbChanges = {"c": "..",
              "facsimileTelephoneNumber": ".*",
              "telephoneNumber": ".*",
              "postalAddress": ".*",
+         "bATVToken": ".*",
              "postalCode": ".*",
               "loginShell": ".*",
               "emailForward": "^([^<>@]+@.+)?$",
@@ -73,6 +74,7 @@ DelItems = {"c": None,
             "facsimileTelephoneNumber": None,
             "telephoneNumber": None,
             "postalAddress": None,
+            "bATVToken": None
             "postalCode": None,
             "emailForward": None,
             "ircNick": None,

diff --git a/userdir-ldap.schema b/userdir-ldap.schema
index 01c0130..fd29592 100644 (file)
--- a/userdir-ldap.schema
+++ b/userdir-ldap.schema
@@ -127,6 +127,7 @@
 #   .11 - DNS RBL
 #   .12 - RHS RBL
 #   .13 - whitelist
+#   .14 - bATVToken
 
 # Public attribute types
 attributetype ( 1.3.6.1.4.1.9586.100.4.2.1 
@@ -483,6 +484,12 @@ attributetype ( 1.3.6.1.4.1.9586.100.4.4.13
        SUBSTR caseIgnoreIA5SubstringsMatch
        SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} )
 
+attributetype ( 1.3.6.1.4.1.9586.100.4.4.14
+       NAME 'bATVToken'
+       DESC 'Token for BATV'
+        EQUALITY caseExactMatch
+        SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE )
+
 attributetype ( 1.3.6.1.4.1.9586.100.4.2.38
        NAME 'mailContentInspectionAction'
        DESC 'what to do on content inspection hits'