X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=userdir-ldap.schema;h=57cdff08661826a4834461e9f26dcaa912727fb2;hb=a8cec059917fb8daada42441329cadf9a89e82be;hp=700947450d4d3cd141dc0304e229bac83c1ee6b4;hpb=0d0ec9c38991f84768628eee0de17888f29d48ea;p=mirror%2Fuserdir-ldap.git

diff --git a/userdir-ldap.schema b/userdir-ldap.schema
index 7009474..57cdff0 100644
--- a/userdir-ldap.schema
+++ b/userdir-ldap.schema
@@ -108,6 +108,7 @@
 #   .40 - exportOptions
 #   .41 - sshdistAuthKeysHost
 #   .42 - dnsTTL
+#   .43 - webPassword
 #
 # .3 - experimental LDAP objectClasses
 #   .1 - debianDeveloper
@@ -129,6 +130,7 @@
 #   .13 - whitelist
 #   .14 - bATVToken
 #   .15 - mailDefaultOptions
+#   .16 - mailPreserveSuffixSeparatorRidiculousName
 
 # Public attribute types
 attributetype ( 1.3.6.1.4.1.9586.100.4.2.1 
@@ -399,6 +401,12 @@ 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 )
+
 # Experimental attribute types
 
 # There are existing schemas for doing DNS in LDAP; would one of
@@ -497,6 +505,12 @@ attributetype ( 1.3.6.1.4.1.9586.100.4.4.15
 	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 '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 )
+
 attributetype ( 1.3.6.1.4.1.9586.100.4.2.38
 	NAME 'mailContentInspectionAction'
 	DESC 'what to do on content inspection hits'
@@ -521,14 +535,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 ) )
 
 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:
 
@@ -544,7 +558,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
+              bATVToken $ mailDefaultOptions $ mailPreserveSuffixSeparatorRidiculousName
 	) )
 
 objectclass ( 1.3.6.1.4.1.9586.100.4.3.2
@@ -566,5 +580,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
+              bATVToken $ mailDefaultOptions $ sshRSAAuthKey $ mailPreserveSuffixSeparatorRidiculousName
 	) )