Fixed objectgroup handling

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

diff --git a/TODO b/TODO
index 93150577c653dc9f6d613f33e258e1a2e30396e7..9c96b42f83bcecc6e62a3a668d3da4828c2ea7f3 100644 (file)
--- 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 5f1e9d64b9a8c09521bfe1d5009427698629a209..21501d3ebb951073d3c4cc56c8fd80b9cbfdbf99 100644 (file)
--- 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 18d0e9670ffecb9d56e0b08b4f1e6f0db88cc35d..17c1db156bea7838dd716f697b751bab5ef14c47 100644 (file)
--- 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 d26f1ddbd6b31e82f1d3bc1ca8373db8b60437bc..f7312d2345017003c6d3040f9a38aabc876dc79a 100644 (file)
--- 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!");