Add mailContentInspectionAction attribute. Possible values are reject, blackhole...

[mirror/userdir-ldap.git] / userdir-ldap.schema

diff --git a/userdir-ldap.schema b/userdir-ldap.schema
index 25c403a..35df6da 100644 (file)
--- a/userdir-ldap.schema
+++ b/userdir-ldap.schema
@@ -1,7 +1,9 @@
 # Revision history:
 #
-# XXX
+#   - [PP] Now version controlled in db.d.o git repository, also see debian/changelog - 2009
 #   - [PP] Now version controlled in db.d.o bzr repository - 2007-12-25
+#
+# long time ago:
 #   - [HE] Add 'purpose', 'physicalHost' to debianServer - 2007-12-25
 #   - [zobel] Add 'VoIP' - 2008-05-10
 #   - [luk] Add 'subGroup' to group - 2008-11-22
@@ -101,6 +103,7 @@
 #   .35 - VoIP
 #   .36 - sudoPassword
 #   .37 - subGroup
+#   .38 - mailContentInspectionAction
 #
 # .3 - experimental LDAP objectClasses
 #   .1 - debianDeveloper
@@ -120,7 +123,6 @@
 #   .11 - DNS RBL
 #   .12 - RHS RBL
 #   .13 - whitelist
-#   .14 - OptOut Spamfiltering
 
 # Public attribute types
 attributetype ( 1.3.6.1.4.1.9586.100.4.2.1 
@@ -479,11 +481,13 @@ 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 'mailSpamOptOut'
-       DESC 'I dont like the debian anti spam setup, i want no spam filtering'
-       EQUALITY booleanMatch
-       SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 SINGLE-VALUE )
+attributetype ( 1.3.6.1.4.1.9586.100.4.2.38
+       NAME 'mailContentInspectionAction'
+       DESC 'what to do on content inspection hits'
+       EQUALITY caseIgnoreIA5Match
+       SUBSTR caseIgnoreIA5SubstringsMatch
+       SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} )
+
 
 # Experimental objectclasses:
 
@@ -498,7 +502,7 @@ objectclass ( 1.3.6.1.4.1.9586.100.4.3.1
              jabberJID $ keyFingerPrint $ latitude $ longitude $ mn $
              onVacation $ privateSub $ sshRSAAuthKey $ supplementaryGid $
              access $ gender $ birthDate $ mailCallout $ mailGreylisting $
-              mailRBL $ mailRHSBL $ mailWhitelist $ VoIP $ mailSpamOptOut
+              mailRBL $ mailRHSBL $ mailWhitelist $ VoIP $ mailContentInspectionAction
        ) )
 
 objectclass ( 1.3.6.1.4.1.9586.100.4.3.2
@@ -517,5 +521,5 @@ objectclass ( 1.3.6.1.4.1.9586.100.4.3.3
        SUP account STRUCTURAL
        MAY ( emailForward $ supplementaryGid $ allowedHost $ labeledURI $
              mailCallout $ mailGreylisting $ mailRBL $ mailRHSBL $
-             mailWhitelist $ mailSpamOptOut $ dnsZoneEntry
+             mailWhitelist $ dnsZoneEntry $ mailContentInspectionAction
        ) )