Fixed schema

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

diff --git a/contrib/openldap/gosa+samba3.schema b/contrib/openldap/gosa+samba3.schema
index 3fa091309164f8baf0d6dbbef19bec3559277753..edd5e8672b2845c9b0de28ebfdf2cea0391d1ae3 100644 (file)
--- a/contrib/openldap/gosa+samba3.schema
+++ b/contrib/openldap/gosa+samba3.schema
@@ -70,9 +70,9 @@ attributetype ( 1.3.6.1.4.1.10098.1.1.12.10 NAME 'gosaSpamMailbox'
 
 attributetype ( 1.3.6.1.4.1.10098.1.1.12.11 NAME 'gosaVacationMessage'
         DESC 'Text to display in case of vacation'
-        EQUALITY caseIgnoreIA5Match
-       SUBSTR caseIgnoreIA5SubstringsMatch
-        SYNTAX 1.3.6.1.4.1.1466.115.121.1.26)
+        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.12 NAME 'gosaMailDeliveryMode'
         DESC 'What to do with mails'
@@ -130,15 +130,15 @@ attributetype ( 1.3.6.1.4.1.10098.1.1.12.20 NAME 'gosaProxyWorkingStop'
 
 attributetype ( 1.3.6.1.4.1.10098.1.1.12.21 NAME 'gosaApplicationName'
         DESC 'Specifies the name of an application to be shown up on users desktop'
-        EQUALITY caseIgnoreIA5Match
-       SUBSTR caseIgnoreIA5SubstringsMatch
-        SYNTAX 1.3.6.1.4.1.1466.115.121.1.26)
+        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.22 NAME 'gosaApplicationExecute'
         DESC 'Specifies the executable path of an application'
-        EQUALITY caseIgnoreIA5Match
-       SUBSTR caseIgnoreIA5SubstringsMatch
-        SYNTAX 1.3.6.1.4.1.1466.115.121.1.26)
+        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.23 NAME 'gosaApplicationFlags'
         DESC 'Specifies the application flags G(roup only), D(esktop), M(enu)'
@@ -198,6 +198,32 @@ attributetype ( 1.3.6.1.4.1.10098.1.1.12.32 NAME 'gosaApplicationMimeType'
        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'
+        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'
+        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.41 NAME 'gosaVacationStart'
+        DESC 'Timestamp for enabling current vacation message'
+        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.42 NAME 'gosaVacationStop'
+        DESC 'Timestamp for switching off current vacation message'
+        SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE)
+
 attributetype ( 1.3.6.1.4.1.10098.1.1.6.2 NAME 'academicTitle'
         DESC 'Field to represent the academic title'
         EQUALITY caseIgnoreIA5Match
@@ -225,7 +251,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 ))
 
@@ -247,7 +273,7 @@ objectclass ( 1.3.6.1.4.1.10098.1.2.1.19.5 NAME 'gosaMailAccount' SUP top AUXILI
        MUST ( mail $ gosaMailServer $ gosaMailDeliveryMode)
        MAY  ( gosaMailQuota $ gosaMailAlternateAddress $ gosaMailForwardingAddress $
               gosaMailMaxSize $ gosaSpamSortLevel $ gosaSpamMailbox $
-              gosaVacationMessage $ gosaSharedFolderTarget $ acl))
+              gosaVacationMessage $ gosaVacationStart $ gosaVacationStop $ gosaSharedFolderTarget $ acl))
 
 objectclass ( 1.3.6.1.4.1.10098.1.2.1.19.6 NAME 'gosaAccount' SUP top AUXILIARY
         DESC 'Objectclass for GOsa Accounts (v2.4)'
@@ -267,7 +293,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 $
@@ -298,3 +324,21 @@ 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 '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 '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  ))
+