If we use accountstatus in debianGroup we need to re-order stuff

[mirror/userdir-ldap.git] / userdir-ldap.schema

diff --git a/userdir-ldap.schema b/userdir-ldap.schema
index fcd8ba3..37dc7c5 100644 (file)
--- a/userdir-ldap.schema
+++ b/userdir-ldap.schema
@@ -395,22 +395,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
@@ -505,6 +489,22 @@ attributetype ( 1.3.6.1.4.1.9586.100.4.2.38
        SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} 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:
 
 objectclass ( 1.3.6.1.4.1.9586.100.4.3.1
@@ -528,8 +528,8 @@ 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 $
+             sshRSAHostKey $ purpose $ allowedGroups $ exportOptions $ MXRecord
        ) )
 
 objectclass ( 1.3.6.1.4.1.9586.100.4.3.3