Updated workstation - Startup

[gosa.git] / plugins / admin / systems / class_dhcpService.inc

diff --git a/plugins/admin/systems/class_dhcpService.inc b/plugins/admin/systems/class_dhcpService.inc
index 477accb7ece67d002d7c3d98002e2605a764bdcc..57f76cc9e19f43440605f282931cfdac49ec679c 100644 (file)
--- a/plugins/admin/systems/class_dhcpService.inc
+++ b/plugins/admin/systems/class_dhcpService.inc
@@ -77,6 +77,7 @@ class dhcpService extends dhcpPlugin
     $display= $smarty->fetch(get_template_path('dhcp_service.tpl', TRUE)).$this->network->execute();
 
     /* Merge arrays for advanced view */
+    $this->fix_options();
     foreach (array("options", "statements") as $type){
       $this->advanced->$type= $this->$type + $this->network->$type;;
     }
@@ -170,7 +171,7 @@ class dhcpService extends dhcpPlugin
 
     $this->attrs['dhcpPrimaryDN']= array($this->dhcpPrimaryDN);
     $this->removeOption('server-name');
-    $this->attrs['dhcpOption'][]= "server-name $server_name";
+#    $this->attrs['dhcpOption'][]= "server-name $server_name";
 
     return ($this->attrs);
   }