X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=userdir-ldap.schema;h=ac3c1cfcbdd4495241aff08891023f9a760eafe9;hb=89ff993193164fbc1c8722e948e9759a2db7c6a2;hp=1be2c2923703cc6ba28f40a5a3bc390a0a63ce89;hpb=9ae0266c86c4b8ea08f8af5727b9d3fb19b86f85;p=mirror%2Fuserdir-ldap.git

diff --git a/userdir-ldap.schema b/userdir-ldap.schema
index 1be2c29..ac3c1cf 100644
--- a/userdir-ldap.schema
+++ b/userdir-ldap.schema
@@ -108,6 +108,8 @@
 #   .40 - exportOptions
 #   .41 - sshdistAuthKeysHost
 #   .42 - dnsTTL
+#   .43 - webPassword
+#   .44 - rtcPassword
 #
 # .3 - experimental LDAP objectClasses
 #   .1 - debianDeveloper
@@ -128,6 +130,8 @@
 #   .12 - RHS RBL
 #   .13 - whitelist
 #   .14 - bATVToken
+#   .15 - mailDefaultOptions
+#   .16 - mailPreserveSuffixSeparator
 
 # Public attribute types
 attributetype ( 1.3.6.1.4.1.9586.100.4.2.1 
@@ -398,6 +402,18 @@ attributetype ( 1.3.6.1.4.1.9586.100.4.2.40
 	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.43
+	NAME 'webPassword'
+	DESC 'web password for SSO'
+	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.44
+	NAME 'rtcPassword'
+	DESC 'rtc password for SIP/XMPP'
+	EQUALITY octetStringMatch
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.40 )
+
 # Experimental attribute types
 
 # There are existing schemas for doing DNS in LDAP; would one of
@@ -490,6 +506,19 @@ attributetype ( 1.3.6.1.4.1.9586.100.4.4.14
         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.4.15
+	NAME 'mailDefaultOptions'
+	DESC 'Whether or not to use a default set of anti-spam options'
+	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.4.16
+	NAME 'mailPreserveSuffixSeparator'
+	DESC 'suffix serparator'
+	EQUALITY caseIgnoreIA5Match
+	SUBSTR caseIgnoreIA5SubstringsMatch
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{1} )
+
 attributetype ( 1.3.6.1.4.1.9586.100.4.2.38
 	NAME 'mailContentInspectionAction'
 	DESC 'what to do on content inspection hits'
@@ -514,14 +543,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 $ sudoPassword ) )
+	MAY ( userPassword $ loginShell $ gecos $ homeDirectory $ description $ mailDisableMessage $ sudoPassword $ webPassword $ voipPassword ) )
 
 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 ) )
+	MAY ( cn $ description $ subGroup $ accountStatus ) )
 
 # Experimental objectclasses:
 
@@ -536,7 +565,8 @@ 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 $ mailContentInspectionAction $ bATVToken
+              mailRBL $ mailRHSBL $ mailWhitelist $ VoIP $ mailContentInspectionAction $
+              bATVToken $ mailDefaultOptions $ mailPreserveSuffixSeparator
 	) )
 
 objectclass ( 1.3.6.1.4.1.9586.100.4.3.2
@@ -557,5 +587,6 @@ 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 $ dnsZoneEntry $ mailContentInspectionAction $ bATVToken
+	      mailWhitelist $ dnsZoneEntry $ mailContentInspectionAction $
+              bATVToken $ mailDefaultOptions $ sshRSAAuthKey $ mailPreserveSuffixSeparator
 	) )