X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=userdir-ldap.schema;h=fd29592cf032c3c2e28c75464a8fac790d76e2be;hb=7d5f5f8886893115fac555847a6f01fcbd8b529e;hp=fcd8ba3c79446c20c6782e78945f9e8f83ca6f8b;hpb=13edde44f147421d558ce4c8549e5573a72849a8;p=mirror%2Fuserdir-ldap.git

diff --git a/userdir-ldap.schema b/userdir-ldap.schema
index fcd8ba3..fd29592 100644
--- a/userdir-ldap.schema
+++ b/userdir-ldap.schema
@@ -106,6 +106,8 @@
 #   .38 - mailContentInspectionAction
 #   .39 - allowedGroups
 #   .40 - exportOptions
+#   .41 - sshdistAuthKeysHost
+#   .42 - dnsTTL
 #
 # .3 - experimental LDAP objectClasses
 #   .1 - debianDeveloper
@@ -125,6 +127,7 @@
 #   .11 - DNS RBL
 #   .12 - RHS RBL
 #   .13 - whitelist
+#   .14 - bATVToken
 
 # Public attribute types
 attributetype ( 1.3.6.1.4.1.9586.100.4.2.1 
@@ -395,22 +398,6 @@ 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 ) )
-
 # Experimental attribute types
 
 # There are existing schemas for doing DNS in LDAP; would one of
@@ -497,6 +484,12 @@ 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.2.38
 	NAME 'mailContentInspectionAction'
 	DESC 'what to do on content inspection hits'
@@ -504,6 +497,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 ) )
+
+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 ) )
 
 # Experimental objectclasses:
 
@@ -528,8 +546,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 $
-	      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