Updated contrib file.

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

diff --git a/contrib/openldap/gosa+samba3.schema b/contrib/openldap/gosa+samba3.schema
index 22fce80a80007b597d80462aa3abc74f635688ae..201606694aa39e9b288dd7dabefff5c1aa913dad 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'
@@ -241,6 +241,14 @@ 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.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
@@ -290,7 +298,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)'
@@ -358,8 +366,7 @@ objectclass ( 1.3.6.1.4.1.10098.1.2.1.19.17 NAME 'gosaRole'
 
 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 $ cn )
-       MAY  ( description ) )
+       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