From 08f024d57211beef5886f6ddf6bf4afb2772cb4c Mon Sep 17 00:00:00 2001 From: cajus Date: Fri, 28 Oct 2005 08:31:26 +0000 Subject: [PATCH] Fixed objectgroup handling git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@1717 594d385d-05f5-0310-b6e9-bd551577e9d8 --- TODO | 3 --- contrib/openldap/gosa+samba3.schema | 2 +- contrib/openldap/gosa.schema | 2 +- plugins/admin/ogroups/class_ogroup.inc | 5 ----- 4 files changed, 2 insertions(+), 10 deletions(-) diff --git a/TODO b/TODO index 93150577c..9c96b42f8 100644 --- a/TODO +++ b/TODO @@ -10,9 +10,6 @@ Things to fix before 2.4: * FAI management - Add package configuration dialog -* Removing of the last element of objectgroups causes an error - -> simple solution: member should be defined as MAY in gosaGroupOfNames? - Target for 2.5: =============== diff --git a/contrib/openldap/gosa+samba3.schema b/contrib/openldap/gosa+samba3.schema index 5f1e9d64b..21501d3eb 100644 --- a/contrib/openldap/gosa+samba3.schema +++ b/contrib/openldap/gosa+samba3.schema @@ -271,7 +271,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 - MUST ( member $ cn $ gosaGroupObjects )) + MUST ( cn $ gosaGroupObjects ) MAY ( member ) ) objectclass ( 1.3.6.1.4.1.10098.1.2.1.19.13 NAME 'gosaWebdavAccount' DESC 'GOsa webdav enabling account (v2.4)' diff --git a/contrib/openldap/gosa.schema b/contrib/openldap/gosa.schema index 18d0e9670..17c1db156 100644 --- a/contrib/openldap/gosa.schema +++ b/contrib/openldap/gosa.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 - MUST ( member $ cn $ gosaGroupObjects )) + MUST ( cn $ gosaGroupObjects ) MAY ( member ) ) objectclass ( 1.3.6.1.4.1.10098.1.2.1.19.13 NAME 'gosaWebdavAccount' DESC 'GOsa webdav enabling account (v2.4)' diff --git a/plugins/admin/ogroups/class_ogroup.inc b/plugins/admin/ogroups/class_ogroup.inc index d26f1ddbd..f7312d234 100644 --- a/plugins/admin/ogroups/class_ogroup.inc +++ b/plugins/admin/ogroups/class_ogroup.inc @@ -528,11 +528,6 @@ class ogroup extends plugin $message[]= "The required field 'Name' is not set."; } - /* Need at least one member */ - if (count($this->member) == 0){ - $message[]= _("Object groups need at least one member!"); - } - /* To many different object types? */ if (strlen($this->gosaGroupObjects) > 4){ $message[]= _("You can combine two different object types at maximum only!"); -- 2.30.2