Added administrational unit tags

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@3159 594d385d-05f5-0310-b6e9-bd551577e9d8

diff --git a/contrib/openldap/gosa+samba3.schema b/contrib/openldap/gosa+samba3.schema
index c12eace2996398f538a46f2cd3654a3f353c3604..424e38222256c3daa320b76008bfcddd2ca9e505 100644 (file)
--- a/contrib/openldap/gosa+samba3.schema
+++ b/contrib/openldap/gosa+samba3.schema
@@ -198,6 +198,12 @@ 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.6.2 NAME 'academicTitle'
         DESC 'Field to represent the academic title'
         EQUALITY caseIgnoreIA5Match
@@ -298,3 +304,12 @@ 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'
+       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'
+       DESC 'Marker for objects below administrational units (v2.5)'
+           SUP top AUXILIARY
+       MUST ( gosaUnitTag ))

diff --git a/contrib/openldap/gosa.schema b/contrib/openldap/gosa.schema
index b0c93e954c50d1666d4cf823ceb8626851ee6fc4..f85c56696ec367095b8fe67a288729b9dfa4e47d 100644 (file)
--- a/contrib/openldap/gosa.schema
+++ b/contrib/openldap/gosa.schema
@@ -1,8 +1,6 @@
 ##
 ## Needed attributes for GOsa (GONICUS System Administrator)
 ##
-## Version 030303
-##
 ## Maintainer: Cajus Pollmeier (pollmeier@GONICUS.de)
 ##
 
@@ -198,6 +196,12 @@ 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.6.2 NAME 'academicTitle'
         DESC 'Field to represent the academic title'
        EQUALITY caseIgnoreMatch
@@ -292,8 +296,18 @@ objectclass ( 1.3.6.1.4.1.10098.1.2.1.19.13 NAME 'gosaWebdavAccount'
         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)'
+       DESC 'GOsa Intarent enabling account (v2.4)'
           SUP top AUXILIARY
        MUST ( cn $ uid )
        MAY ( gosaDefaultLanguage ))
 
+objectclass ( 1.3.6.1.4.1.10098.1.2.1.19.15 NAME 'gosaAdministrationalUnit'
+       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'
+       DESC 'Marker for objects below administrational units (v2.5)'
+          SUP top AUXILIARY
+       MUST ( gosaUnitTag ))
+