Backport from trunk

[gosa.git] / gosa-plugins / systems / admin / systems / tabs_server.inc

diff --git a/gosa-plugins/systems/admin/systems/tabs_server.inc b/gosa-plugins/systems/admin/systems/tabs_server.inc
index ea977581a05597e6bf26fc7f8819b7873ffab1d4..d4ae749931470857e6707cb065f359e441c61eea 100644 (file)
--- a/gosa-plugins/systems/admin/systems/tabs_server.inc
+++ b/gosa-plugins/systems/admin/systems/tabs_server.inc
@@ -73,7 +73,7 @@ class servtabs extends tabs
     $baseobject= NULL;
     foreach($this->by_object as $name => $object){
       $class = get_class($object);
-      if(in_array($class,array("reference","acl"))) continue;
+      if(in_array_strict($class,array("reference","acl"))) continue;
       if ($baseobject === NULL){
         $baseobject= new $class($this->config, $this->dn,NULL,$this);
         $baseobject->enable_CSN_check();
@@ -101,7 +101,9 @@ class servtabs extends tabs
     /* Check for new 'dn', in order to propagate the
        'dn' to all plugins */
     $baseobject= $this->by_object['servgeneric'];
-    $this->dn= "cn=$baseobject->cn,".get_ou('serverRDN').$baseobject->base;
+    $cn      = preg_replace('/,/', '\,', $baseobject->cn);
+    $cn      = preg_replace('/"/', '\"', $cn);
+    $this->dn= "cn={$cn},".get_ou("servgeneric", "serverRDN").$baseobject->base;
 
     /* cn is not case sensitive for ldap, but for php it is!! */
     if($baseobject->orig_dn != "new"){