Trying to put more sense into the groupOfNames discussion. Both,

kolab and gosa groupOfNames are now sup AUXLIARY and therefore
combinable.

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

diff --git a/contrib/openldap/gosa+samba3.schema b/contrib/openldap/gosa+samba3.schema
index ae11c77549be0f14120930167deaa110c2f4525e..73cd18533af5480d49f43f386bec4bba56e1baf3 100644 (file)
--- a/contrib/openldap/gosa+samba3.schema
+++ b/contrib/openldap/gosa+samba3.schema
@@ -270,7 +270,7 @@ 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 groupOfNames STRUCTURAL
+        SUP groupOfNames AUXILIARY
         MUST ( cn $ gosaGroupObjects ))
 
 objectclass ( 1.3.6.1.4.1.10098.1.2.1.19.13 NAME 'gosaWebdavAccount'

diff --git a/contrib/openldap/gosa.schema b/contrib/openldap/gosa.schema
index b9e0b756277ab8d01a4b7584039b9e1f1cde4d1f..585843fe0a9dfdd8c6f742c16bdda154a40e7551 100644 (file)
--- a/contrib/openldap/gosa.schema
+++ b/contrib/openldap/gosa.schema
@@ -269,7 +269,7 @@ 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 groupOfNames STRUCTURAL
+        SUP groupOfNames AUXILIARY
         MUST ( cn $ gosaGroupObjects ))
 
 objectclass ( 1.3.6.1.4.1.10098.1.2.1.19.13 NAME 'gosaWebdavAccount'

diff --git a/contrib/openldap/kolab2.schema b/contrib/openldap/kolab2.schema
index d696d6c11a60fadf392b50d7c8e1d917decfd8e1..4ab94a20bb6edeb21f4419a94d97e1beb15b44d0 100644 (file)
--- a/contrib/openldap/kolab2.schema
+++ b/contrib/openldap/kolab2.schema
@@ -565,6 +565,6 @@ objectclass ( 1.3.6.1.4.1.19414.3.2.4
 objectclass ( 1.3.6.1.4.1.19414.3.2.5    
   NAME 'kolabGroupOfNames'    
   DESC 'Kolab group of names (DNs) derived from RFC2256'    
-  SUP gosaGroupOfNames STRUCTURAL    
+  SUP goupOfNames AUXILIARY
   MAY ( mail $    
         kolabDeleteflag ) )