X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=contrib%2Fopenldap%2Fgosa.schema;h=17891503b104a4930ea42318fe8e4fcf03780a5f;hb=09421065476754c687f771f1250989e6ae74432f;hp=cc672487609ec81d3de0976977e3391df434f165;hpb=0dac3376ec6ca3dfa8b082b4d4e0ec1abb8c139b;p=gosa.git

diff --git a/contrib/openldap/gosa.schema b/contrib/openldap/gosa.schema
index cc6724876..17891503b 100644
--- a/contrib/openldap/gosa.schema
+++ b/contrib/openldap/gosa.schema
@@ -156,9 +156,9 @@ attributetype ( 1.3.6.1.4.1.10098.1.1.12.25 NAME 'gosaSharedFolderTarget'
 
 attributetype ( 1.3.6.1.4.1.10098.1.1.12.26 NAME 'gosaMemberApplication'
         DESC 'Like memberUid, just for applications'
-        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.27 NAME 'gosaApplicationParameter'
         DESC 'Store application parameters'
@@ -166,6 +166,12 @@ attributetype ( 1.3.6.1.4.1.10098.1.1.12.27 NAME 'gosaApplicationParameter'
 	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.31 NAME 'gosaApplicationCategory'
+        DESC 'Store application parameters'
+	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.28 NAME 'gosaProxyQuota'
         DESC 'Specifies the amount of data a user may surf in a defined period of time'
         EQUALITY caseIgnoreIA5Match
@@ -202,8 +208,12 @@ attributetype ( 1.3.6.1.4.1.15305.2.2 NAME ( 'dateOfBirth' 'dob' )
 	SYNTAX	1.3.6.1.4.1.1466.115.121.1.15{10}
 	SINGLE-VALUE )
 
+# cyrus imapd access control list
+# acls work with users and groups
 attributetype ( 1.3.6.1.4.1.19414.2.1.651
 	NAME 'acl'
+    EQUALITY caseIgnoreIA5Match
+	SUBSTR caseIgnoreIA5SubstringsMatch
 	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} )
 
 # Objectclasses
@@ -252,7 +262,7 @@ objectclass ( 1.3.6.1.4.1.10098.1.2.1.19.9 NAME 'gosaApplication'
         DESC 'Objectclass for GOsa applications (v2.4)'
         MUST ( cn $ gosaApplicationExecute )
         MAY ( gosaApplicationName $ gosaApplicationIcon $ gosaApplicationFlags $
-              gosaApplicationParameter $ description ))
+              gosaApplicationParameter $ gotoLogonScript $ description $ gosaApplicationCategory ))
 
 objectclass ( 1.3.6.1.4.1.10098.1.2.1.19.10 NAME 'gosaApplicationGroup' SUP top AUXILIARY
         DESC 'Objectclass for GOsa application groups (v2.4)'
@@ -266,10 +276,16 @@ objectclass ( 1.3.6.1.4.1.10098.1.2.1.19.11 NAME 'gosaUserTemplate' SUP top AUXI
 objectclass ( 1.3.6.1.4.1.10098.1.2.1.19.12 NAME 'gosaGroupOfNames'
         DESC 'GOsa object grouping (v2.4)'
         SUP top STRUCTURAL
-        MUST ( cn $ gosaGroupObjects )
-        MAY ( businessCategory $ seeAlso $ owner $ ou $ o $ description $ member ) )
+		MUST ( cn $ gosaGroupObjects ) MAY ( description $ member ) )
 
 objectclass ( 1.3.6.1.4.1.10098.1.2.1.19.13 NAME 'gosaWebdavAccount'
         DESC 'GOsa webdav enabling account (v2.4)'
         SUP top AUXILIARY
         MUST ( cn $ uid ))
+
+objectclass ( 1.3.6.1.4.1.10098.1.2.1.19.14 NAME 'gosaIntranetAccount'
+       DESC 'GOsa Inatrent enabling account (v2.4)'
+	   SUP top AUXILIARY
+       MUST ( cn $ uid )
+       MAY ( gosaDefaultLanguage ))
+