From: cajus Date: Mon, 27 Jun 2005 07:46:52 +0000 (+0000) Subject: Trying to put more sense into the groupOfNames discussion. Both, X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=909b2bd8100221206988da80c807fe2cb85a9c98;p=gosa.git 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 ae11c7754..73cd18533 100644 --- 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 b9e0b7562..585843fe0 100644 --- 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 d696d6c11..4ab94a20b 100644 --- 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 ) )