From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Mon, 15 Mar 2010 08:45:03 +0000 (+0000)
Subject: Fixed automitic creation of departments (create_missing_trees)
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=8a5dd6f05565e68f2c9ab567dc0e32b5a394870a;p=gosa.git

Fixed automitic creation of departments (create_missing_trees)
-Must values of the target objectClass were filled with 'filled' automatically, even if the value was already given.


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

diff --git a/gosa-core/include/class_ldap.inc b/gosa-core/include/class_ldap.inc
index a1b6a8702..d75f800b4 100644
--- a/gosa-core/include/class_ldap.inc
+++ b/gosa-core/include/class_ldap.inc
@@ -709,8 +709,11 @@ class LDAP{
             $na['objectClass'][]= 'locality';
           }
           $na[$type]= $param;
+
+          // Fill in MUST values - but do not overwrite existing ones.
           if (is_array($classes[$ocname]['MUST'])){
             foreach($classes[$ocname]['MUST'] as $attr){
+              if(isset($na[$attr]) && !empty($na[$attr])) continue;
               $na[$attr]= "filled";
             }
           }