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

diff --git a/userdir-ldap.schema b/userdir-ldap.schema
index 37dc7c5..2774250 100644
--- a/userdir-ldap.schema
+++ b/userdir-ldap.schema
@@ -106,6 +106,11 @@
 #   .38 - mailContentInspectionAction
 #   .39 - allowedGroups
 #   .40 - exportOptions
+#   .41 - sshdistAuthKeysHost
+#   .42 - dnsTTL
+#   .43 - webPassword
+#   .44 - rtcPassword
+#   .45 - rebootPolicy
 #
 # .3 - experimental LDAP objectClasses
 #   .1 - debianDeveloper
@@ -125,6 +130,9 @@
 #   .11 - DNS RBL
 #   .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 
@@ -395,6 +403,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
@@ -481,6 +501,25 @@ 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 'bATVToken'
+	DESC 'Token for BATV'
+        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'
@@ -488,6 +527,22 @@ attributetype ( 1.3.6.1.4.1.9586.100.4.2.38
 	SUBSTR caseIgnoreIA5SubstringsMatch
 	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} SINGLE-VALUE )
 
+attributetype ( 1.3.6.1.4.1.9586.100.4.2.41
+	NAME ( 'sshdistAuthKeysHost' )
+	SUP ipHostNumber )
+
+attributetype ( 1.3.6.1.4.1.9586.100.4.4.42
+	NAME 'dnsTTL'
+	DESC 'DNS Time To Live value'
+	EQUALITY caseIgnoreIA5Match
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE )
+
+attributetype ( 1.3.6.1.4.1.9586.100.4.4.45
+	NAME 'rebootPolicy'
+	DESC 'which procedure to use for rebooting this host'
+	EQUALITY caseIgnoreIA5Match
+	SUBSTR caseIgnoreIA5SubstringsMatch
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} )
 
 # Public object classes
 
@@ -496,14 +551,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 $ rtcPassword ) )
 
 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:
 
@@ -518,7 +573,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
+              mailRBL $ mailRHSBL $ mailWhitelist $ VoIP $ mailContentInspectionAction $
+              bATVToken $ mailDefaultOptions $ mailPreserveSuffixSeparator
 	) )
 
 objectclass ( 1.3.6.1.4.1.9586.100.4.3.2
@@ -528,8 +584,9 @@ 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 $ status $ physicalHost $ ipHostNumber $
-	      sshRSAHostKey $ purpose $ allowedGroups $ exportOptions $ MXRecord
+	      sponsor-admin $ status $ physicalHost $ ipHostNumber $ dnsTTL $
+	      sshRSAHostKey $ purpose $ allowedGroups $ exportOptions $ MXRecord $
+	      sshdistAuthKeysHost $ rebootPolicy
 	) )
 
 objectclass ( 1.3.6.1.4.1.9586.100.4.3.3
@@ -538,5 +595,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
+	      mailWhitelist $ dnsZoneEntry $ mailContentInspectionAction $
+              bATVToken $ mailDefaultOptions $ sshRSAAuthKey $ mailPreserveSuffixSeparator
 	) )