X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=userdir-ldap.schema;h=5d3d233e3f08793330b603b7ab648daa417fb727;hb=dd0db4737b29096a07d9b244a21d4ff2e63dc869;hp=33a6922f72c46a67322e71e7e27ee8fac0e20450;hpb=443e8855704a416fc920a4e3bf0c515cbc4be11c;p=mirror%2Fuserdir-ldap.git

diff --git a/userdir-ldap.schema b/userdir-ldap.schema
index 33a6922..5d3d233 100644
--- a/userdir-ldap.schema
+++ b/userdir-ldap.schema
@@ -1,9 +1,12 @@
 # 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
 #
 # 0.7 [RM]
 #   - Add 'gender' and 'birthDate' to debianDeveloper
@@ -99,6 +102,8 @@
 #   .34 - physicalHost
 #   .35 - VoIP
 #   .36 - sudoPassword
+#   .37 - subGroup
+#   .38 - mailContentInspectionAction
 #
 # .3 - experimental LDAP objectClasses
 #   .1 - debianDeveloper
@@ -366,6 +371,13 @@ attributetype ( 1.3.6.1.4.1.9586.100.4.2.36
 	EQUALITY octetStringMatch
 	SYNTAX 1.3.6.1.4.1.1466.115.121.1.40 )
 
+attributetype ( 1.3.6.1.4.1.9586.100.4.2.37
+	NAME 'subGroup'
+	DESC 'name of other group for which membership implied by memberschip to this group'
+	EQUALITY caseIgnoreIA5Match
+	SUBSTR caseIgnoreIA5SubstringsMatch
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
+
 
 # Public object classes
 
@@ -381,7 +393,7 @@ objectclass ( 1.3.6.1.4.1.9586.100.4.1.2
 	SUP top STRUCTURAL
 	DESC 'attributes used for Debian groups'
 	MUST ( gid $ gidNumber )
-	MAY ( description ) )
+	MAY ( description $ subGroup ) )
 
 # Experimental attribute types
 
@@ -469,6 +481,14 @@ 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.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} SINGLE-VALUE )
+
+
 # Experimental objectclasses:
 
 objectclass ( 1.3.6.1.4.1.9586.100.4.3.1
@@ -482,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
+              mailRBL $ mailRHSBL $ mailWhitelist $ VoIP $ mailContentInspectionAction
 	) )
 
 objectclass ( 1.3.6.1.4.1.9586.100.4.3.2
@@ -501,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
+	      mailWhitelist $ dnsZoneEntry $ mailContentInspectionAction
 	) )