diff --git a/contrib/openldap/core-fd.schema b/contrib/openldap/core-fd.schema
index 692d4ee7a511bf66c75d54c4bfdc7da8303cdb5a..110267fd5daa2565b97b8e9bc21732c86d7be47b 100644
--- a/contrib/openldap/core-fd.schema
+++ b/contrib/openldap/core-fd.schema
@@ -5,78 +5,78 @@
# Attributes
attributetype ( 1.3.6.1.4.1.10098.1.1.12.1 NAME 'gosaSubtreeACL'
- DESC 'GOsa acl entry'
+ DESC 'GOsa - ACL entry'
EQUALITY caseIgnoreMatch
SUBSTR caseIgnoreSubstringsMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.15)
attributetype ( 1.3.6.1.4.1.10098.1.1.12.2 NAME 'gosaUser'
- DESC 'GOsa user'
+ DESC 'GOsa - DN of a user'
EQUALITY caseIgnoreMatch
SUBSTR caseIgnoreSubstringsMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.15)
attributetype ( 1.3.6.1.4.1.10098.1.1.12.3 NAME 'gosaObject'
- DESC 'GOsa object'
+ DESC 'GOsa - DN of an object'
EQUALITY caseIgnoreMatch
SUBSTR caseIgnoreSubstringsMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.15)
attributetype ( 1.3.6.1.4.1.10098.1.1.12.14 NAME 'gosaDefaultLanguage'
- DESC 'Defines the default language for a user'
+ DESC 'GOsa - Defines the default language for a user'
EQUALITY caseIgnoreIA5Match
SUBSTR caseIgnoreIA5SubstringsMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE)
attributetype ( 1.3.6.1.4.1.10098.1.1.12.30 NAME 'gosaGroupObjects'
- DESC 'Takes a list of all object types that are in a gosaGroupOfNames'
+ DESC 'GOsa - List of all object types that are in a gosaGroupOfNames'
EQUALITY caseIgnoreIA5Match
SUBSTR caseIgnoreIA5SubstringsMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE)
attributetype ( 1.3.6.1.4.1.10098.1.1.12.33 NAME 'gosaUnitTag'
- DESC 'Takes a list of relevant mime-type|priority settings'
+ DESC 'GOsa - Takes a list of relevant mime-type|priority settings'
OBSOLETE
EQUALITY caseIgnoreIA5Match
SUBSTR caseIgnoreIA5SubstringsMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE)
attributetype ( 1.3.6.1.4.1.10098.1.1.12.34 NAME 'gosaAclTemplate'
- DESC 'Takes ACL entries for gosaRoles'
+ DESC 'GOsa - ACL entries for ACL roles'
EQUALITY caseIgnoreIA5Match
SUBSTR caseIgnoreIA5SubstringsMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.26)
attributetype ( 1.3.6.1.4.1.10098.1.1.12.35 NAME 'gosaAclEntry'
- DESC 'Takes ACL entries for gosaRoles'
+ DESC 'GOsa - ACL entries'
EQUALITY caseIgnoreIA5Match
SUBSTR caseIgnoreIA5SubstringsMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.26)
attributetype ( 1.3.6.1.4.1.10098.1.1.12.36 NAME 'gosaSnapshotType'
- DESC 'Takes either undo or snapshot'
+ DESC 'GOsa - Takes either undo or snapshot'
OBSOLETE
EQUALITY caseIgnoreMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE)
attributetype ( 1.3.6.1.4.1.10098.1.1.12.37 NAME 'gosaSnapshotTimestamp'
- DESC 'Unix timestamp of snapshot'
+ DESC 'GOsa - Unix timestamp of snapshot'
EQUALITY caseIgnoreMatch
SUBSTR caseIgnoreSubstringsMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE)
attributetype ( 1.3.6.1.4.1.10098.1.1.12.38 NAME 'gosaSnapshotDN'
- DESC 'Original DN of saved object'
+ DESC 'GOsa - Original DN of saved object in snapshot'
EQUALITY caseIgnoreMatch
SUBSTR caseIgnoreSubstringsMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE)
attributetype ( 1.3.6.1.4.1.10098.1.1.12.39 NAME 'gosaSnapshotData'
- DESC 'Original DN of saved object'
+ DESC 'GOsa - Original data of saved object in snapshot'
SYNTAX 1.3.6.1.4.1.1466.115.121.1.5 SINGLE-VALUE)
attributetype ( 1.3.6.1.4.1.10098.1.1.12.46 NAME 'gosaLoginRestriction'
- DESC 'Multivalue attribute to carry a number of allowed ips/subnets'
+ DESC 'GOsa - Multivalue attribute to carry a number of allowed ips/subnets'
SUP name)
attributetype ( 1.3.6.1.4.1.10098.1.1.6.2 NAME 'academicTitle'
@@ -98,37 +98,43 @@ attributetype ( 1.3.6.1.4.1.15305.2.2 NAME ( 'dateOfBirth' 'dob' )
SINGLE-VALUE )
# Classes
-objectclass ( 1.3.6.1.4.1.10098.1.2.1.19.1 NAME 'gosaObject' SUP top AUXILIARY
- DESC 'Class for GOsa settings (v2.6.1)'
+objectclass ( 1.3.6.1.4.1.10098.1.2.1.19.1 NAME 'gosaObject'
+ DESC 'GOsa - Class for GOsa settings (v2.6.1)'
+ SUP top AUXILIARY
MUST ( gosaSubtreeACL ))
-objectclass ( 1.3.6.1.4.1.10098.1.2.1.19.2 NAME 'gosaLockEntry' SUP top STRUCTURAL
- DESC 'Class for GOsa locking (v2.6.1)'
+objectclass ( 1.3.6.1.4.1.10098.1.2.1.19.2 NAME 'gosaLockEntry'
+ DESC 'GOsa - Class for GOsa locking (v2.6.1)'
+ SUP top STRUCTURAL
MUST ( gosaUser $ gosaObject $ cn ))
-objectclass ( 1.3.6.1.4.1.10098.1.2.1.19.3 NAME 'gosaCacheEntry' SUP top STRUCTURAL
- DESC 'Class for GOsa caching (v2.6.1)'
+objectclass ( 1.3.6.1.4.1.10098.1.2.1.19.3 NAME 'gosaCacheEntry'
+ DESC 'GOsa - Class for GOsa caching (v2.6.1)'
+ SUP top STRUCTURAL
MAY ( gosaUser )
MUST ( cn ))
-objectclass ( 1.3.6.1.4.1.10098.1.2.1.19.4 NAME 'gosaDepartment' SUP top AUXILIARY
- DESC 'Class to mark Departments for GOsa (v2.6.1)'
+objectclass ( 1.3.6.1.4.1.10098.1.2.1.19.4 NAME 'gosaDepartment'
+ DESC 'GOsa - Class to mark Departments for GOsa (v2.6.1)'
+ SUP top AUXILIARY
MUST ( ou $ description )
MAY ( manager ))
-objectclass ( 1.3.6.1.4.1.10098.1.2.1.19.6 NAME 'gosaAccount' SUP top AUXILIARY
- DESC 'Class for GOsa Accounts (v2.6.6)'
+objectclass ( 1.3.6.1.4.1.10098.1.2.1.19.6 NAME 'gosaAccount'
+ DESC 'GOsa - Class for GOsa Accounts (v2.6.6)'
+ SUP top AUXILIARY
MUST ( uid )
- MAY ( sambaLMPassword $ sambaNTPassword $ sambaPwdLastSet $
+ MAY ( sambaLMPassword $ sambaNTPassword $ sambaPwdLastSet $
gosaDefaultLanguage $ academicTitle $ personalTitle $ dateOfBirth $
sambaBadPasswordCount $ sambaBadPasswordTime $ gender $ gosaLoginRestriction ))
-objectclass ( 1.3.6.1.4.1.10098.1.2.1.19.11 NAME 'gosaUserTemplate' SUP top AUXILIARY
- DESC 'Class for GOsa User Templates (v2.6.1)'
+objectclass ( 1.3.6.1.4.1.10098.1.2.1.19.11 NAME 'gosaUserTemplate'
+ DESC 'GOsa - Class for GOsa User Templates (v2.6.1)'
+ SUP top AUXILIARY
MUST ( cn ))
objectclass ( 1.3.6.1.4.1.10098.1.2.1.19.12 NAME 'gosaGroupOfNames'
- DESC 'GOsa object grouping (v2.6.1)'
+ DESC 'GOsa - Adds the gosaGroupObjects field to groupOfNames (v2.6.1)'
SUP top STRUCTURAL
MUST ( cn $ gosaGroupObjects ) MAY ( member $ description ) )
@@ -145,16 +151,19 @@ objectclass ( 1.3.6.1.4.1.10098.1.2.1.19.16 NAME 'gosaAdministrativeUnitTag'
MUST ( gosaUnitTag ))
objectclass ( 1.3.6.1.4.1.10098.1.2.1.19.17 NAME 'gosaRole'
- DESC 'ACL container to define roles (v2.6.1)' SUP top STRUCTURAL
+ DESC 'GOsa - ACL container to define ACL roles (v2.6.1)'
+ SUP top STRUCTURAL
MUST ( gosaAclTemplate $ cn )
MAY ( description ) )
objectclass ( 1.3.6.1.4.1.10098.1.2.1.19.18 NAME 'gosaAcl'
- DESC 'ACL container to define single ACLs (v2.6.1)' SUP top AUXILIARY
+ DESC 'GOsa - ACL container to define single ACLs (v2.6.1)'
+ SUP top AUXILIARY
MUST ( gosaAclEntry ))
objectclass ( 1.3.6.1.4.1.10098.1.2.1.19.19 NAME 'gosaSnapshotObject'
- DESC 'Container object for undo and snapshot data (v2.6.1)' SUP top STRUCTURAL
+ DESC 'GOsa - Container object for undo and snapshot data (v2.6.1)'
+ SUP top STRUCTURAL
MUST ( gosaSnapshotTimestamp $ gosaSnapshotDN $ gosaSnapshotData )
MAY ( description $
gosaSnapshotType ) )