X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=userdir-ldap.schema;h=73c86404291bb685fc4ec3676b37bfe6b2514177;hb=6bfb2e39cd7bc15ff6a7a7d6f8afec5ad7c8dbc1;hp=78809c8918383a6e2660178bd7ad26183d4daa83;hpb=94816beef8147934e62e2e864b116ab65e6572f1;p=mirror%2Fuserdir-ldap.git

diff --git a/userdir-ldap.schema b/userdir-ldap.schema
index 78809c8..73c8640 100644
--- a/userdir-ldap.schema
+++ b/userdir-ldap.schema
@@ -106,6 +106,9 @@
 #   .38 - mailContentInspectionAction
 #   .39 - allowedGroups
 #   .40 - exportOptions
+#   .41 - sshdistAuthKeysHost
+#   .42 - dnsTTL
+#   .43 - webPassword
 #
 # .3 - experimental LDAP objectClasses
 #   .1 - debianDeveloper
@@ -125,6 +128,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,21 +401,11 @@ 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 )
 
-# Public object classes
-
-objectclass ( 1.3.6.1.4.1.9586.100.4.1.1
-	NAME 'debianAccount'
-	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 ) )
-
-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 ) )
+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
 
@@ -497,6 +493,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'
@@ -504,6 +519,31 @@ 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 )
+
+# Public object classes
+
+objectclass ( 1.3.6.1.4.1.9586.100.4.1.1
+	NAME 'debianAccount'
+	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 ) )
+
+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 ( cn $ description $ subGroup $ accountStatus ) )
 
 # Experimental objectclasses:
 
@@ -518,7 +558,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 +569,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
+	      sponsor-admin $ status $ physicalHost $ ipHostNumber $ dnsTTL $
+	      sshRSAHostKey $ purpose $ allowedGroups $ exportOptions $ MXRecord $
+	      sshdistAuthKeysHost
 	) )
 
 objectclass ( 1.3.6.1.4.1.9586.100.4.3.3
@@ -538,5 +580,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
 	) )