X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=userdir-ldap.schema;h=37dc7c5d53f79fb571b242287759d99b026f24d7;hb=2420263569c3f95df9e0e4bf06937dafebc7920e;hp=25c403a8f99457bff26f3d14e4e4b5ace9ca59bd;hpb=05cb0be6ff864b84947ab815e469f41d1f423d6c;p=mirror%2Fuserdir-ldap.git

diff --git a/userdir-ldap.schema b/userdir-ldap.schema
index 25c403a..37dc7c5 100644
--- 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,9 @@
 #   .35 - VoIP
 #   .36 - sudoPassword
 #   .37 - subGroup
+#   .38 - mailContentInspectionAction
+#   .39 - allowedGroups
+#   .40 - exportOptions
 #
 # .3 - experimental LDAP objectClasses
 #   .1 - debianDeveloper
@@ -120,7 +125,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 
@@ -376,22 +380,20 @@ attributetype ( 1.3.6.1.4.1.9586.100.4.2.37
 	SUBSTR caseIgnoreIA5SubstringsMatch
 	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
 
+# more attributes below
+attributetype ( 1.3.6.1.4.1.9586.100.4.2.39
+	NAME 'allowedGroups'
+	DESC 'Groups that have access to a host'
+	EQUALITY caseExactIA5Match
+	SUBSTR caseExactIA5SubstringsMatch
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
 
-# Public object classes
-
-objectclass ( 1.3.6.1.4.1.9586.100.4.1.1
-	NAME 'debianAccount'
-	DESC 'Abstraction of an account with POSIX attributes and UTF8 support'
-	SUP top AUXILIARY
-	MUST ( cn $ uid $ uidNumber $ gidNumber )
-	MAY ( userPassword $ loginShell $ gecos $ homeDirectory $ description $ mailDisableMessage $ sudoPassword ) )
-
-objectclass ( 1.3.6.1.4.1.9586.100.4.1.2
-	NAME 'debianGroup'
-	SUP top STRUCTURAL
-	DESC 'attributes used for Debian groups'
-	MUST ( gid $ gidNumber )
-	MAY ( description $ subGroup ) )
+attributetype ( 1.3.6.1.4.1.9586.100.4.2.40
+	NAME 'exportOptions'
+	DESC 'export options for servers'
+	EQUALITY caseIgnoreIA5Match
+	SUBSTR caseIgnoreIA5SubstringsMatch
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
 
 # Experimental attribute types
 
@@ -479,11 +481,29 @@ 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} SINGLE-VALUE )
+
+
+# Public object classes
+
+objectclass ( 1.3.6.1.4.1.9586.100.4.1.1
+	NAME 'debianAccount'
+	DESC 'Abstraction of an account with POSIX attributes and UTF8 support'
+	SUP top AUXILIARY
+	MUST ( cn $ uid $ uidNumber $ gidNumber )
+	MAY ( userPassword $ loginShell $ gecos $ homeDirectory $ description $ mailDisableMessage $ sudoPassword ) )
+
+objectclass ( 1.3.6.1.4.1.9586.100.4.1.2
+	NAME 'debianGroup'
+	SUP top STRUCTURAL
+	DESC 'attributes used for Debian groups'
+	MUST ( gid $ gidNumber )
+	MAY ( description $ subGroup $ accountStatus ) )
 
 # Experimental objectclasses:
 
@@ -498,7 +518,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
@@ -508,7 +528,8 @@ objectclass ( 1.3.6.1.4.1.9586.100.4.3.2
 	MUST ( host $ hostname )
 	MAY ( c $ access $ admin $ architecture $ bandwidth $ description $ disk $
 	      distribution $ l $ machine $ memory $ sponsor $
-	      sponsor-admin $ sshRSAHostKey $ status $ purpose $ physicalHost
+	      sponsor-admin $ status $ physicalHost $ ipHostNumber $
+	      sshRSAHostKey $ purpose $ allowedGroups $ exportOptions $ MXRecord
 	) )
 
 objectclass ( 1.3.6.1.4.1.9586.100.4.3.3
@@ -517,5 +538,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
 	) )