Added gosa settings for samba3 based schema

[gosa.git] / contrib / openldap / gosa.schema

diff --git a/contrib/openldap/gosa.schema b/contrib/openldap/gosa.schema
index 1e1bc3223cee6f4ecf87dbe188f2d0d31a8399b7..cb4fe7bf15ce72089da6e584a66a3aab9c9d01fb 100644 (file)
--- a/contrib/openldap/gosa.schema
+++ b/contrib/openldap/gosa.schema
@@ -228,12 +228,17 @@ attributetype ( 1.3.6.1.4.1.10098.1.1.12.37 NAME 'gosaSnapshotTimestamp'
 attributetype ( 1.3.6.1.4.1.10098.1.1.12.38 NAME 'gosaSnapshotDN'
         DESC 'Original DN of saved object'
         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'
         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.40 NAME 'gosaSetting'
+        DESC 'Original DN of saved object'
+        SYNTAX 1.3.6.1.4.1.1466.115.121.1.15)
+
 attributetype ( 1.3.6.1.4.1.10098.1.1.6.2 NAME 'academicTitle'
         DESC 'Field to represent the academic title'
        EQUALITY caseIgnoreMatch
@@ -344,8 +349,9 @@ 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.5)' SUP top AUXILIARY
-       MUST ( gosaAclTemplate  ))
+       DESC 'ACL container to define roles (v2.5)' 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.5)' SUP top AUXILIARY
@@ -356,3 +362,7 @@ objectclass ( 1.3.6.1.4.1.10098.1.2.1.19.19 NAME 'gosaSnapshotObject'
        MUST ( gosaSnapshotType $ gosaSnapshotTimestamp $ gosaSnapshotDN $ gosaSnapshotData )
        MAY  ( description ) )
 
+objectclass ( 1.3.6.1.4.1.10098.1.2.1.19.20 NAME 'gosaConfig'
+       DESC 'Settings for gosa. Replaces parts of the gosa.conf. (v2.6)' SUP top STRUCTURAL
+       MAY  ( gosaSetting ) )
+