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

diff --git a/userdir-ldap.schema b/userdir-ldap.schema
index d089f0b..25c403a 100644
--- a/userdir-ldap.schema
+++ b/userdir-ldap.schema
@@ -3,6 +3,8 @@
 # XXX
 #   - [PP] Now version controlled in db.d.o bzr repository - 2007-12-25
 #   - [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
@@ -96,6 +98,9 @@
 #   .32 - mailDisableMessage
 #   .33 - purpose
 #   .34 - physicalHost
+#   .35 - VoIP
+#   .36 - sudoPassword
+#   .37 - subGroup
 #
 # .3 - experimental LDAP objectClasses
 #   .1 - debianDeveloper
@@ -115,6 +120,7 @@
 #   .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 
@@ -350,6 +356,27 @@ attributetype ( 1.3.6.1.4.1.9586.100.4.2.34
 	SINGLE-VALUE
 	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} )
 
+attributetype ( 1.3.6.1.4.1.9586.100.4.2.35
+	NAME 'VoIP'
+	DESC 'VoIP URL to communicate with that person'
+	EQUALITY caseIgnoreIA5Match
+	SUBSTR caseIgnoreIA5SubstringsMatch
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
+
+attributetype ( 1.3.6.1.4.1.9586.100.4.2.36
+	NAME 'sudoPassword'
+	DESC 'sudo password'
+	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
 
 objectclass ( 1.3.6.1.4.1.9586.100.4.1.1
@@ -357,14 +384,14 @@ objectclass ( 1.3.6.1.4.1.9586.100.4.1.1
 	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 ) )
+	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 ) )
+	MAY ( description $ subGroup ) )
 
 # Experimental attribute types
 
@@ -452,6 +479,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 '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 )
+
 # Experimental objectclasses:
 
 objectclass ( 1.3.6.1.4.1.9586.100.4.3.1
@@ -465,7 +498,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
+              mailRBL $ mailRHSBL $ mailWhitelist $ VoIP $ mailSpamOptOut
 	) )
 
 objectclass ( 1.3.6.1.4.1.9586.100.4.3.2
@@ -484,5 +517,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 $ mailSpamOptOut $ dnsZoneEntry
 	) )