From 2420263569c3f95df9e0e4bf06937dafebc7920e Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Tue, 22 Sep 2009 21:47:31 +0200 Subject: [PATCH] If we use accountstatus in debianGroup we need to re-order stuff --- userdir-ldap.schema | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/userdir-ldap.schema b/userdir-ldap.schema index ca2dc83..37dc7c5 100644 --- 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 $ accountStatus ) ) - # 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 -- 2.20.1