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

diff --git a/userdir-ldap.schema b/userdir-ldap.schema
index 57cdff0..ac3c1cf 100644
--- a/userdir-ldap.schema
+++ b/userdir-ldap.schema
@@ -109,6 +109,7 @@
 #   .41 - sshdistAuthKeysHost
 #   .42 - dnsTTL
 #   .43 - webPassword
+#   .44 - rtcPassword
 #
 # .3 - experimental LDAP objectClasses
 #   .1 - debianDeveloper
@@ -130,7 +131,7 @@
 #   .13 - whitelist
 #   .14 - bATVToken
 #   .15 - mailDefaultOptions
-#   .16 - mailPreserveSuffixSeparatorRidiculousName
+#   .16 - mailPreserveSuffixSeparator
 
 # Public attribute types
 attributetype ( 1.3.6.1.4.1.9586.100.4.2.1 
@@ -407,6 +408,12 @@ attributetype ( 1.3.6.1.4.1.9586.100.4.2.43
 	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
@@ -506,10 +513,11 @@ attributetype ( 1.3.6.1.4.1.9586.100.4.4.15
 	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 'mailPreserveSuffixSeparatorRidiculousName'
-	DESC 'Whether or not to preserve the suffix serparator'
-	EQUALITY booleanMatch
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 SINGLE-VALUE )
+	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'
@@ -535,7 +543,7 @@ 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 $ webPassword ) )
+	MAY ( userPassword $ loginShell $ gecos $ homeDirectory $ description $ mailDisableMessage $ sudoPassword $ webPassword $ voipPassword ) )
 
 objectclass ( 1.3.6.1.4.1.9586.100.4.1.2
 	NAME 'debianGroup'
@@ -558,7 +566,7 @@ objectclass ( 1.3.6.1.4.1.9586.100.4.3.1
 	      onVacation $ privateSub $ sshRSAAuthKey $ supplementaryGid $
 	      access $ gender $ birthDate $ mailCallout $ mailGreylisting $
               mailRBL $ mailRHSBL $ mailWhitelist $ VoIP $ mailContentInspectionAction $
-              bATVToken $ mailDefaultOptions $ mailPreserveSuffixSeparatorRidiculousName
+              bATVToken $ mailDefaultOptions $ mailPreserveSuffixSeparator
 	) )
 
 objectclass ( 1.3.6.1.4.1.9586.100.4.3.2
@@ -580,5 +588,5 @@ objectclass ( 1.3.6.1.4.1.9586.100.4.3.3
 	MAY ( emailForward $ supplementaryGid $ allowedHost $ labeledURI $
 	      mailCallout $ mailGreylisting $ mailRBL $ mailRHSBL $
 	      mailWhitelist $ dnsZoneEntry $ mailContentInspectionAction $
-              bATVToken $ mailDefaultOptions $ sshRSAAuthKey $ mailPreserveSuffixSeparatorRidiculousName
+              bATVToken $ mailDefaultOptions $ sshRSAAuthKey $ mailPreserveSuffixSeparator
 	) )