From 2f9491c9fe382c97d9598d95ddd5b57766f22052 Mon Sep 17 00:00:00 2001
From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Tue, 22 Jul 2008 12:53:25 +0000
Subject: [PATCH] Prepared dhcp plugins for ACLs.

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@11749 594d385d-05f5-0310-b6e9-bd551577e9d8
---
 .../services/dhcp/class_dhcpAdvanced.inc      |  4 +++
 .../systems/services/dhcp/class_dhcpGroup.inc |  7 ++++--
 .../systems/services/dhcp/class_dhcpHost.inc  |  3 +++
 .../services/dhcp/class_dhcpNetwork.inc       |  3 +++
 .../services/dhcp/class_dhcpPlugin.inc        |  7 +++++-
 .../systems/services/dhcp/class_dhcpPool.inc  |  3 +++
 .../services/dhcp/class_dhcpService.inc       |  3 +++
 .../services/dhcp/class_dhcpSharedNetwork.inc |  3 +++
 .../services/dhcp/class_dhcpSubnet.inc        |  3 +++
 .../systems/services/dhcp/class_servDHCP.inc  |  9 ++++---
 .../systems/services/dhcp/dhcp_advanced.tpl   | 16 ++++++++++++
 .../systems/services/dhcp/dhcp_group.tpl      |  2 ++
 .../admin/systems/services/dhcp/dhcp_host.tpl |  8 ++++++
 .../systems/services/dhcp/dhcp_network.tpl    | 24 ++++++++++++++++++
 .../admin/systems/services/dhcp/dhcp_pool.tpl |  6 +++++
 .../systems/services/dhcp/dhcp_service.tpl    |  8 ++++++
 .../services/dhcp/dhcp_sharedNetwork.tpl      | 18 +++++++++++++
 .../systems/services/dhcp/dhcp_subnet.tpl     | 25 ++++++++++++++++---
 18 files changed, 141 insertions(+), 11 deletions(-)

diff --git a/gosa-plugins/dhcp/admin/systems/services/dhcp/class_dhcpAdvanced.inc b/gosa-plugins/dhcp/admin/systems/services/dhcp/class_dhcpAdvanced.inc
index 3e2be402e..9f9df65fc 100644
--- a/gosa-plugins/dhcp/admin/systems/services/dhcp/class_dhcpAdvanced.inc
+++ b/gosa-plugins/dhcp/admin/systems/services/dhcp/class_dhcpAdvanced.inc
@@ -30,6 +30,7 @@ class dhcpAdvanced extends plugin
   /* attribute list for save action */
   var $attributes= array();
   var $objectclasses= array();
+  var $parent;
 
   function dhcpAdvanced()
   {
@@ -71,6 +72,9 @@ class dhcpAdvanced extends plugin
 
     $smarty= get_smarty();
 
+	/* Assign ACLs */
+	$smarty->assign("acl",$this->parent->getacl(""));
+
     /* Assign arrays */
     $statements= array();
     foreach ($this->statements as $key => $val){
diff --git a/gosa-plugins/dhcp/admin/systems/services/dhcp/class_dhcpGroup.inc b/gosa-plugins/dhcp/admin/systems/services/dhcp/class_dhcpGroup.inc
index 8e92b5ce0..08d728efb 100644
--- a/gosa-plugins/dhcp/admin/systems/services/dhcp/class_dhcpGroup.inc
+++ b/gosa-plugins/dhcp/admin/systems/services/dhcp/class_dhcpGroup.inc
@@ -23,10 +23,10 @@ class dhcpGroup extends dhcpPlugin
   /* attribute list for save action */
   var $objectclasses= array('top', 'dhcpGroup', 'dhcpOptions');
 
-  function dhcpGroup(&$attrs)
+  function dhcpGroup($parent,&$attrs)
   {
     /* Load statements / options */
-    dhcpPlugin::dhcpPlugin($attrs);
+    dhcpPlugin::dhcpPlugin($parent,$attrs);
   }
 
   function execute()
@@ -34,6 +34,9 @@ class dhcpGroup extends dhcpPlugin
     $smarty= get_smarty();
     $smarty->assign("cn", $this->cn);
 
+	/* Assign ACLs */
+	$smarty->assign("acl",$this->parent->getacl(""));
+
     /* Show main page */
     $display= $smarty->fetch (get_template_path('dhcp_group.tpl', TRUE, dirname(__FILE__))).$this->network->execute();
 
diff --git a/gosa-plugins/dhcp/admin/systems/services/dhcp/class_dhcpHost.inc b/gosa-plugins/dhcp/admin/systems/services/dhcp/class_dhcpHost.inc
index 87f4f247a..89b0c1d80 100644
--- a/gosa-plugins/dhcp/admin/systems/services/dhcp/class_dhcpHost.inc
+++ b/gosa-plugins/dhcp/admin/systems/services/dhcp/class_dhcpHost.inc
@@ -49,6 +49,9 @@ class dhcpHost extends dhcpPlugin
     $smarty->assign("dhcpHWAddress", preg_replace('/^[^ ]+ /', '', $this->dhcpHWAddress));
     $smarty->assign("realGosaHost",$this->realGosaHost);
 
+    /* Assign ACLs */
+    $smarty->assign("acl",$this->parent->getacl(""));
+
     /* Create fixed address */
     if (isset($this->statements['fixed-address'])){
       $smarty->assign("fixedaddr", $this->statements['fixed-address']);
diff --git a/gosa-plugins/dhcp/admin/systems/services/dhcp/class_dhcpNetwork.inc b/gosa-plugins/dhcp/admin/systems/services/dhcp/class_dhcpNetwork.inc
index 1b9453542..6054eb696 100644
--- a/gosa-plugins/dhcp/admin/systems/services/dhcp/class_dhcpNetwork.inc
+++ b/gosa-plugins/dhcp/admin/systems/services/dhcp/class_dhcpNetwork.inc
@@ -70,6 +70,9 @@ class dhcpNetwork extends plugin
     /* Show main page */
     $smarty= get_smarty();
 
+    /* Assign ACLs */
+    $smarty->assign("acl",$this->parent->getacl(""));
+
     /*
      * Assemble options
      */
diff --git a/gosa-plugins/dhcp/admin/systems/services/dhcp/class_dhcpPlugin.inc b/gosa-plugins/dhcp/admin/systems/services/dhcp/class_dhcpPlugin.inc
index 615981ce1..ac8d0f86a 100644
--- a/gosa-plugins/dhcp/admin/systems/services/dhcp/class_dhcpPlugin.inc
+++ b/gosa-plugins/dhcp/admin/systems/services/dhcp/class_dhcpPlugin.inc
@@ -34,8 +34,10 @@ class dhcpPlugin extends plugin
   var $attributes= array();
   var $objectclasses= array();
 
-  function dhcpPlugin($attrs)
+  function dhcpPlugin(&$parent,$attrs)
   {
+	$this->parent = $parent;
+
     /* Load statements / options */
     if (is_array($attrs)){
       $this->dn= $attrs['dn'];
@@ -82,6 +84,9 @@ class dhcpPlugin extends plugin
     $this->advanced->options= $this->options;
     $this->advanced->statements= $this->statements;
 
+	$this->network->parent = $parent;
+	$this->advanced->parent = $parent;
+
     /* Save CN for later reference */
     $this->orig_cn= $this->cn;
   }
diff --git a/gosa-plugins/dhcp/admin/systems/services/dhcp/class_dhcpPool.inc b/gosa-plugins/dhcp/admin/systems/services/dhcp/class_dhcpPool.inc
index 0de8a8682..e2cff119b 100644
--- a/gosa-plugins/dhcp/admin/systems/services/dhcp/class_dhcpPool.inc
+++ b/gosa-plugins/dhcp/admin/systems/services/dhcp/class_dhcpPool.inc
@@ -49,6 +49,9 @@ class dhcpPool extends dhcpPlugin
     $smarty->assign("range_start", $this->range_start);
     $smarty->assign("range_stop", $this->range_stop);
 
+    /* Assign ACLs */
+    $smarty->assign("acl",$this->parent->getacl(""));
+
     /* Show main page */
     $display= $smarty->fetch(get_template_path('dhcp_pool.tpl', TRUE, dirname(__FILE__))).$this->network->execute();
 
diff --git a/gosa-plugins/dhcp/admin/systems/services/dhcp/class_dhcpService.inc b/gosa-plugins/dhcp/admin/systems/services/dhcp/class_dhcpService.inc
index 5856976d3..59c565884 100644
--- a/gosa-plugins/dhcp/admin/systems/services/dhcp/class_dhcpService.inc
+++ b/gosa-plugins/dhcp/admin/systems/services/dhcp/class_dhcpService.inc
@@ -58,6 +58,9 @@ class dhcpService extends dhcpPlugin
     /* Show main page */
     $smarty= get_smarty();
 
+    /* Assign ACLs */
+    $smarty->assign("acl",$this->parent->getacl(""));
+
     $smarty->assign('ddns_styles', $this->ddns_styles);
     foreach (array('max_lease_time', 'default_lease_time', 'ddns_update_style') as $value){
       if (isset($this->statements[preg_replace('/_/', '-', $value)])){
diff --git a/gosa-plugins/dhcp/admin/systems/services/dhcp/class_dhcpSharedNetwork.inc b/gosa-plugins/dhcp/admin/systems/services/dhcp/class_dhcpSharedNetwork.inc
index f51be78dc..e512cb663 100644
--- a/gosa-plugins/dhcp/admin/systems/services/dhcp/class_dhcpSharedNetwork.inc
+++ b/gosa-plugins/dhcp/admin/systems/services/dhcp/class_dhcpSharedNetwork.inc
@@ -37,6 +37,9 @@ class dhcpSharedNetwork extends dhcpPlugin
   {
     $smarty= get_smarty();
 
+    /* Assign ACLs */
+    $smarty->assign("acl",$this->parent->getacl(""));
+
     /* Fill template */
     $smarty->assign ("cn", $this->cn);
     foreach (array("server-identifier", "default-lease-time", "max-lease-time", "min-lease-time") as $attr){
diff --git a/gosa-plugins/dhcp/admin/systems/services/dhcp/class_dhcpSubnet.inc b/gosa-plugins/dhcp/admin/systems/services/dhcp/class_dhcpSubnet.inc
index 18c02eced..fe10195cc 100644
--- a/gosa-plugins/dhcp/admin/systems/services/dhcp/class_dhcpSubnet.inc
+++ b/gosa-plugins/dhcp/admin/systems/services/dhcp/class_dhcpSubnet.inc
@@ -57,6 +57,9 @@ class dhcpSubnet extends dhcpPlugin
     $smarty->assign("cn", $this->cn);
     $smarty->assign("dhcp_netmask", $this->dhcpNetMask);
 
+    /* Assign ACLs */
+    $smarty->assign("acl",$this->parent->getacl(""));
+
     /* Prepare range */
     if ($this->use_range){
       $smarty->assign("use_range", "checked");
diff --git a/gosa-plugins/dhcp/admin/systems/services/dhcp/class_servDHCP.inc b/gosa-plugins/dhcp/admin/systems/services/dhcp/class_servDHCP.inc
index 219fa5f87..9872d70c7 100644
--- a/gosa-plugins/dhcp/admin/systems/services/dhcp/class_servDHCP.inc
+++ b/gosa-plugins/dhcp/admin/systems/services/dhcp/class_servDHCP.inc
@@ -121,7 +121,7 @@ class servdhcp extends goService
       $section= $_POST['section'];
       $tmp = new dhcpNewSectionDialog(NULL);
       if (isset($tmp->sectionMap[$section])){
-        $this->dialog= new $section($this->current_object);
+        $this->dialog= new $section($this,$this->current_object);
         $this->current_object= "";
       } else {
         $this->dialog= FALSE;
@@ -154,6 +154,7 @@ class servdhcp extends goService
         }
         $data= $this->dialog->save();
         if ($this->current_object == ""){
+
           /* New object */
           $newsects= array();
           foreach ($this->dhcpSections as $key => $dsc){
@@ -242,7 +243,7 @@ class servdhcp extends goService
         if (isset($this->dhcpObjectCache[$dn])){
           $section= $this->objectType($dn);
           $this->current_object= $dn;
-          $this->dialog= new $section($this->dhcpObjectCache[$dn]);
+          $this->dialog= new $section($this,$this->dhcpObjectCache[$dn]);
         }
       }
 
@@ -264,7 +265,7 @@ class servdhcp extends goService
       if (isset($this->dhcpObjectCache[$dn])){
         $section= $this->objectType($dn);
         $this->current_object= $dn;
-        $this->dialog= new $section($this->dhcpObjectCache[$dn]);
+        $this->dialog= new $section($this,$this->dhcpObjectCache[$dn]);
       }
     }
     
@@ -274,7 +275,7 @@ class servdhcp extends goService
       if (isset($this->dhcpObjectCache[$dn])){
         $section= $this->objectType($dn);
         $this->current_object= $dn;
-        $this->dialog= new $section($this->dhcpObjectCache[$dn]);
+        $this->dialog= new $section($this,$this->dhcpObjectCache[$dn]);
       }
     }
     
diff --git a/gosa-plugins/dhcp/admin/systems/services/dhcp/dhcp_advanced.tpl b/gosa-plugins/dhcp/admin/systems/services/dhcp/dhcp_advanced.tpl
index b743a73d6..803fd261c 100644
--- a/gosa-plugins/dhcp/admin/systems/services/dhcp/dhcp_advanced.tpl
+++ b/gosa-plugins/dhcp/admin/systems/services/dhcp/dhcp_advanced.tpl
@@ -14,26 +14,42 @@
    <br>
    <b>{t}DHCP statements{/t}</b>
    <br>
+{render acl=$acl}
    <select name='dhcpstatements' style="width:100%;" size="14">
     {html_options values=$dhcpstatements output=$dhcpstatements}
    </select>
+{/render}
    <br>
+{render acl=$acl}
    <input type='text' name='addstatement' size='25' maxlength='80'>&nbsp;
+{/render}
+{render acl=$acl}
    <input type='submit' name='add_statement' value='{msgPool type=addButton}'>&nbsp;
+{/render}
+{render acl=$acl}
    <input type='submit' name='delete_statement' value='{msgPool type=delButton}'> 
+{/render}
   </td>
 
   <td>
    <br>
    <b>{t}DHCP options{/t}</b>
    <br>
+{render acl=$acl}
    <select name='dhcpoptions' style="width:100%;" size="14">
     {html_options values=$dhcpoptions output=$dhcpoptions}
    </select>
+{/render}
    <br>
+{render acl=$acl}
    <input type='text' name='addoption' size='25' maxlength='80'>&nbsp;
+{/render}
+{render acl=$acl}
    <input type='submit' name='add_option' value='{msgPool type=addButton}'>&nbsp;
+{/render}
+{render acl=$acl}
    <input type='submit' name='delete_option' value='{msgPool type=delButton}'> 
+{/render}
   </td>
  </tr>
 </table>
diff --git a/gosa-plugins/dhcp/admin/systems/services/dhcp/dhcp_group.tpl b/gosa-plugins/dhcp/admin/systems/services/dhcp/dhcp_group.tpl
index 930fc05ee..ba57fb381 100644
--- a/gosa-plugins/dhcp/admin/systems/services/dhcp/dhcp_group.tpl
+++ b/gosa-plugins/dhcp/admin/systems/services/dhcp/dhcp_group.tpl
@@ -6,8 +6,10 @@
    {t}Name{/t}{$must}
   </td> 
   <td>
+{render acl=$acl}
    <input id='cn' type='text' name='cn' size='25' maxlength='80' value='{$cn}'
         title='{t}Name of group{/t}'>
+{/render}
   </td>
  </tr>
 </table>
diff --git a/gosa-plugins/dhcp/admin/systems/services/dhcp/dhcp_host.tpl b/gosa-plugins/dhcp/admin/systems/services/dhcp/dhcp_host.tpl
index 602c51255..d49c4d680 100644
--- a/gosa-plugins/dhcp/admin/systems/services/dhcp/dhcp_host.tpl
+++ b/gosa-plugins/dhcp/admin/systems/services/dhcp/dhcp_host.tpl
@@ -7,16 +7,20 @@
     <tr>
      <td>{t}Name{/t}{$must}</td>
      <td>
+{render acl=$acl}
       <input {if $realGosaHost} disabled {/if} id='cn' type='text' name='cn' size='25' maxlength='80' value='{$cn}'
              title='{t}Name of host{/t}'>
+{/render}
      </td>
     </tr>
     <tr>
      <td>{t}Fixed address{/t}</td>
      <td>
+{render acl=$acl}
       <input {if $realGosaHost} disabled {/if} 
 			type='text' name='fixedaddr' size='25' maxlength='80' value='{$fixedaddr}'
              title='{t}Use hostname or IP-address to assign fixed address{/t}'>
+{/render}
      </td>
     </tr>
    </table>
@@ -26,15 +30,19 @@
     <tr>
      <td>{t}Hardware type{/t}</td>
      <td>
+{render acl=$acl}
       <select name='hwtype'  {if $realGosaHost} disabled {/if} >
        {html_options options=$hwtypes selected=$hwtype}
       </select>
+{/render}
      </td>
     </tr>
     <tr>
      <td>{t}Hardware address{/t}{$must}</td>
      <td>
+{render acl=$acl}
       <input  {if $realGosaHost}  disabled {/if} type='text' name='dhcpHWAddress' size='20' maxlength='18' value='{$dhcpHWAddress}'>
+{/render}
      </td>
     </tr>
    </table>
diff --git a/gosa-plugins/dhcp/admin/systems/services/dhcp/dhcp_network.tpl b/gosa-plugins/dhcp/admin/systems/services/dhcp/dhcp_network.tpl
index d9374a195..5716a7eb0 100644
--- a/gosa-plugins/dhcp/admin/systems/services/dhcp/dhcp_network.tpl
+++ b/gosa-plugins/dhcp/admin/systems/services/dhcp/dhcp_network.tpl
@@ -7,20 +7,26 @@
     <tr>
      <td>{t}Router{/t}</td>
      <td>
+{render acl=$acl}
       <input id='routers' type='text' name='routers' size='25' maxlength='80' value='{$routers}'
               title='{t}Enter name or IP address of router to be used in this section{/t}'>
+{/render}
      </td>
     </tr>
     <tr>
      <td>{t}Netmask{/t}</td>
      <td>
+{render acl=$acl}
       <input type='text' name='subnet_mask' size='18' maxlength='15' value='{$subnet_mask}'>
+{/render}
      </td>
     </tr>
     <tr>
      <td>{t}Broadcast{/t}</td>
      <td>
+{render acl=$acl}
       <input type='text' name='broadcast_address' size='18' maxlength='15' value='{$broadcast_address}'>
+{/render}
      </td>
     </tr>
    </table>
@@ -31,15 +37,19 @@
     <tr>
      <td>{t}Filename{/t}</td>
      <td>
+{render acl=$acl}
       <input type='text' name='filename' size='25' maxlength='80' value='{$filename}'
               title='{t}Enter name of file that will be loaded via tftp after client has started{/t}'>
+{/render}
      </td>
     </tr>
     <tr>
      <td>{t}Next server{/t}</td>
      <td>
+{render acl=$acl}
       <input type='text' name='nextserver' size='25' maxlength='80' value='{$nextserver}'
               title='{t}Enter name of server to retrieve bootimages from{/t}'>
+{/render}
      </td>
     </tr>
    </table>
@@ -51,29 +61,43 @@
     <tr>
      <td>{t}Domain{/t}</td>
      <td>
+{render acl=$acl}
       <input type='text' name='domain' size='25' maxlength='80' value='{$domain}'
               title='{t}Name of domain{/t}'>
+{/render}
      </td>
     </tr>
     <tr>
      <td colspan=2>
       <br>
       {t}DNS server{/t}<br>
+{render acl=$acl}
       <select name='dnsserver'  title='{t}List of DNS servers to be propagated{/t}' style="width:350px;" size="4">
        {html_options options=$dnsservers}
       </select>
+{/render}
       <br>
+{render acl=$acl}
       <input type='text' name='addserver' size='25' maxlength='80' title='{t}DNS server do be added{/t}'>&nbsp;
+{/render}
+{render acl=$acl}
       <input type='submit' name='add_dns' value='{msgPool type=addButton}' title='{t}Click here add the selected server to the list{/t}'>
+{/render}
+{render acl=$acl}
       <input type='submit' name='delete_dns' value='{msgPool type=delButton}' title='{t}Click here remove the selected servers from the list{/t}'>
+{/render}
      </td>
     </tr>
     <tr>
      <td colspan=2>
       <p><b>{t}Domain Name Service options{/t}</b></p>
+{render acl=$acl}
       <input type=checkbox name="autohost" value="1" {$autohost}>{t}Assign hostnames found via reverse mapping{/t}
+{/render}
       <br>
+{render acl=$acl}
       <input type=checkbox name="autohostdecl" value="1" {$autohostdecl}>{t}Assign hostnames from host declarations{/t}
+{/render}
      </td>
     </tr>
    </table>
diff --git a/gosa-plugins/dhcp/admin/systems/services/dhcp/dhcp_pool.tpl b/gosa-plugins/dhcp/admin/systems/services/dhcp/dhcp_pool.tpl
index dcbd05c3d..7b1ec4f5e 100644
--- a/gosa-plugins/dhcp/admin/systems/services/dhcp/dhcp_pool.tpl
+++ b/gosa-plugins/dhcp/admin/systems/services/dhcp/dhcp_pool.tpl
@@ -4,14 +4,20 @@
  <tr>
   <td width="50%">
    {t}Name{/t}{$must}&nbsp;
+{render acl=$acl}
    <input id='cn' type='text' name='cn' size='25' maxlength='80' value='{$cn}'
         title='{t}Name of pool{/t}'>
+{/render}
   </td>
   <td>
    {t}Range{/t}{$must}&nbsp;
+{render acl=$acl}
    <input type='text' name='range_start' size='25' maxlength='30' value='{$range_start}'>
+{/render}
    &nbsp;-&nbsp;
+{render acl=$acl}
    <input type='text' name='range_stop' size='25' maxlength='30' value='{$range_stop}'>
+{/render}
   </td>
  </tr>
 </table>
diff --git a/gosa-plugins/dhcp/admin/systems/services/dhcp/dhcp_service.tpl b/gosa-plugins/dhcp/admin/systems/services/dhcp/dhcp_service.tpl
index 6ca515e67..94f709ae7 100644
--- a/gosa-plugins/dhcp/admin/systems/services/dhcp/dhcp_service.tpl
+++ b/gosa-plugins/dhcp/admin/systems/services/dhcp/dhcp_service.tpl
@@ -3,12 +3,16 @@
 <table width="100%">
  <tr>
   <td width="50%">
+{render acl=$acl}
   <input id='authoritative' type=checkbox name="authoritative" value="1" {$authoritative}> {t}Authoritative service{/t}<br>
+{/render}
   <br>
   {t}Dynamic DNS update{/t} 
+{render acl=$acl}
   <select name='ddns_update_style'  title='{t}Dynamic DNS update style{/t}' size="1">
        {html_options values=$ddns_styles output=$ddns_styles selected=$ddns_update_style}
   </select>
+{/render}
   </td>
 
   <td style='vertical-align:top'>
@@ -17,13 +21,17 @@
     <tr>
       <td>{t}Default lease time (s){/t}</td>
       <td>
+{render acl=$acl}
       <input type='text' name='default_lease_time' size='25' maxlength='80' value='{$default_lease_time}' title='{t}Enter default lease time in seconds.{/t}'>
+{/render}
       </td>
     </tr>
     <tr>
       <td>{t}Maximum lease time (s){/t}</td>
       <td>
+{render acl=$acl}
       <input type='text' name='max_lease_time' size='25' maxlength='80' value='{$max_lease_time}' title='{t}Enter maximum lease time in seconds.{/t}'>
+{/render}
       </td>
     </tr>
    </table>
diff --git a/gosa-plugins/dhcp/admin/systems/services/dhcp/dhcp_sharedNetwork.tpl b/gosa-plugins/dhcp/admin/systems/services/dhcp/dhcp_sharedNetwork.tpl
index 374da3500..b7467147f 100644
--- a/gosa-plugins/dhcp/admin/systems/services/dhcp/dhcp_sharedNetwork.tpl
+++ b/gosa-plugins/dhcp/admin/systems/services/dhcp/dhcp_sharedNetwork.tpl
@@ -9,14 +9,18 @@
     <tr>
      <td>{t}Name{/t}{$must}</td>
      <td>
+{render acl=$acl}
       <input id='cn' type='text' name='cn' size='25' maxlength='80' value='{$cn}' title='{t}Name for shared network{/t}'>
+{/render}
      </td>
     </tr>
     <tr>
      <td>{t}Server identifier{/t}</td>
      <td>
+{render acl=$acl}
       <input type='text' name='server-identifier' size='25' maxlength='80' value='{$server_identifier}'
 	title='{t}Propagated server identifier for this shared network{/t}'>
+{/render}
      </td>
     </tr>
    </table>
@@ -27,8 +31,10 @@
    <table>
     <tr>
      <td>
+{render acl=$acl}
       <input type=checkbox name="authoritative" value="1" {$authoritative}
        title="{t}Select if this server is authoritative for this shared network{/t}">{t}Authoritative server{/t}
+{/render}
      </td>
     </tr>
    </table>
@@ -48,22 +54,28 @@
     <tr>
      <td>{t}Default lease time{/t}</td>
      <td>
+{render acl=$acl}
       <input type='text' name='default-lease-time' size='10' maxlength='25' value='{$default_lease_time}'
         title='{t}Default lease time{/t}'>&nbsp;{t}seconds{/t}
+{/render}
      </td>
     </tr>
     <tr>
      <td>{t}Max. lease time{/t}</td>
      <td>
+{render acl=$acl}
       <input type='text' name='max-lease-time' size='10' maxlength='25' value='{$max_lease_time}'
         title='{t}Maximum lease time{/t}'>&nbsp;{t}seconds{/t}
+{/render}
      </td>
     </tr>
     <tr>
      <td>{t}Min. lease time{/t}</td>
      <td>
+{render acl=$acl}
       <input type='text' name='min-lease-time' size='10' maxlength='25' value='{$min_lease_time}'
         title='{t}Minimum lease time{/t}'>&nbsp;{t}seconds{/t}
+{/render}
      </td>
     </tr>
    </table>
@@ -75,20 +87,26 @@
    <table>
     <tr>
      <td>
+{render acl=$acl}
      <input type=checkbox name="unknown-clients" value="1" {$allow_unknown_state}
         title="{t}Select if unknown clients should get dynamic IP addresses{/t}">{t}Allow unknown clients{/t}
+{/render}
      </td>
     </tr>
     <tr>
      <td>
+{render acl=$acl}
      <input type=checkbox name="bootp" value="1" {$allow_bootp_state}
         title="{t}Select if bootp clients should get dynamic IP addresses{/t}">{t}Allow bootp clients{/t}
+{/render}
      </td>
     </tr>
     <tr>
      <td>
+{render acl=$acl}
      <input type=checkbox name="booting" value="1" {$allow_booting_state}
         title="{t}Select if clients are allowed to boot using this DHCP server{/t}">{t}Allow booting{/t}
+{/render}
      </td>
     </tr>
    </table>
diff --git a/gosa-plugins/dhcp/admin/systems/services/dhcp/dhcp_subnet.tpl b/gosa-plugins/dhcp/admin/systems/services/dhcp/dhcp_subnet.tpl
index 05425fbdc..7f19551b1 100644
--- a/gosa-plugins/dhcp/admin/systems/services/dhcp/dhcp_subnet.tpl
+++ b/gosa-plugins/dhcp/admin/systems/services/dhcp/dhcp_subnet.tpl
@@ -6,24 +6,41 @@
    <table>
     <tr>
      <td>{t}Network address{/t}{$must}</td>
-     <td><input id='cn' type='text' name='cn' size='25' maxlength='80' value='{$cn}'></td>
+     <td>
+{render acl=$acl}
+		<input id='cn' type='text' name='cn' size='25' maxlength='80' value='{$cn}'>
+{/render}
+	</td>
     </tr>
     <tr>
      <td>{t}Netmask{/t}{$must}</td>
-     <td><input type='text' name='dhcp_netmask' size='25' maxlength='80' value='{$dhcp_netmask}'></tr>
+     <td>
+{render acl=$acl}
+		<input type='text' name='dhcp_netmask' size='25' maxlength='80' value='{$dhcp_netmask}'>
+{/render}
+	</tr>
    </table>
   </td>
   <td style='vertical-align:top'>
    <table>
     <tr>
-     <td><input type="checkbox" name="use_range" value="1" onChange="changeState('range_start');changeState('range_stop');" {$use_range}></td>
+     <td>
+{render acl=$acl}
+		<input type="checkbox" name="use_range" value="1" 
+			onChange="changeState('range_start');changeState('range_stop');" {$use_range}></td>
+{/render}
      <td>{t}Range for dynamic address assignment{/t}</td>
   </tr>
   <tr>
   <td>&nbsp;</td>
-  <td><input type='text' id='range_start' name='range_start' size='25' maxlength='80' value='{$range_start}' {$range_disabled}>
+  <td>
+{render acl=$acl}
+	<input type='text' id='range_start' name='range_start' size='25' maxlength='80' value='{$range_start}' {$range_disabled}>
+{/render}
   &nbsp;<b>-</b>&nbsp;
+{render acl=$acl}
   <input type='text' id='range_stop' name='range_stop' size='25' maxlength='80' value='{$range_stop}' {$range_disabled}>
+{/render}
   </td>
   </tr>
   </table>
-- 
2.30.2