Inital acl fixed for conferences

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

diff --git a/contrib/openldap/gosa.schema b/contrib/openldap/gosa.schema
index f85c56696ec367095b8fe67a288729b9dfa4e47d..adf22d449cfd2e332e33f529d403b79d39135247 100644 (file)
--- a/contrib/openldap/gosa.schema
+++ b/contrib/openldap/gosa.schema
@@ -202,6 +202,39 @@ attributetype ( 1.3.6.1.4.1.10098.1.1.12.33 NAME 'gosaUnitTag'
         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'
+        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'
+        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'
+        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'
+        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'
+        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.6.2 NAME 'academicTitle'
         DESC 'Field to represent the academic title'
        EQUALITY caseIgnoreMatch
@@ -229,7 +262,7 @@ attributetype ( 1.3.6.1.4.1.19414.2.1.651
        SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} )
 
 # Objectclasses
-objectclass ( 1.3.6.1.4.1.10098.1.2.1.19.1 NAME 'gosaObject' AUXILIARY
+objectclass ( 1.3.6.1.4.1.10098.1.2.1.19.1 NAME 'gosaObject' SUP top AUXILIARY
         DESC 'Objectclass for GOsa settings (v2.4)'
         MUST ( gosaSubtreeACL ))
 
@@ -270,7 +303,7 @@ objectclass ( 1.3.6.1.4.1.10098.1.2.1.19.8 NAME 'gosaProxyAccount' SUP top AUXIL
         MAY ( gosaProxyID $ gosaProxyWorkingStart $ gosaProxyWorkingStop $ gosaProxyQuota $
               gosaProxyQuotaPeriod ))
 
-objectclass ( 1.3.6.1.4.1.10098.1.2.1.19.9 NAME 'gosaApplication'
+objectclass ( 1.3.6.1.4.1.10098.1.2.1.19.9 NAME 'gosaApplication' SUP top STRUCTURAL
         DESC 'Objectclass for GOsa applications (v2.4)'
         MUST ( cn $ gosaApplicationExecute )
         MAY ( gosaApplicationName $ gosaApplicationIcon $ gosaApplicationFlags $ gosaApplicationMimeType $
@@ -301,13 +334,26 @@ objectclass ( 1.3.6.1.4.1.10098.1.2.1.19.14 NAME 'gosaIntranetAccount'
        MUST ( cn $ uid )
        MAY ( gosaDefaultLanguage ))
 
-objectclass ( 1.3.6.1.4.1.10098.1.2.1.19.15 NAME 'gosaAdministrationalUnit'
+objectclass ( 1.3.6.1.4.1.10098.1.2.1.19.15 NAME 'gosaAdministrativeUnit'
        DESC 'Marker for administrational units (v2.5)'
           SUP top AUXILIARY
        MUST ( gosaUnitTag ))
 
-objectclass ( 1.3.6.1.4.1.10098.1.2.1.19.16 NAME 'gosaAdministrationalUnitTag'
+objectclass ( 1.3.6.1.4.1.10098.1.2.1.19.16 NAME 'gosaAdministrativeUnitTag'
        DESC 'Marker for objects below administrational units (v2.5)'
           SUP top AUXILIARY
        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  ))
+
+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
+       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.5)' SUP top STRUCTURAL
+       MUST ( gosaSnapshotType $ gosaSnapshotTimestamp $ gosaSnapshotDN $ gosaSnapshotData )
+       MAY  ( description ) )
+