Fixed nagios ACLS

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

diff --git a/plugins/admin/groups/acl_definition.inc b/plugins/admin/groups/acl_definition.inc
index 0de443edc8b28d54c77be49dea2268533c536921..a0ccd2b97225e1d63d3a6052e737f63c8513732b 100644 (file)
--- a/plugins/admin/groups/acl_definition.inc
+++ b/plugins/admin/groups/acl_definition.inc
@@ -248,5 +248,22 @@ $ACLD['phpscheduleitAccount']      =array("gosaphpscheduleit"              );
 $ACLD['phoneAccount'] = array("goFonDeliveryMode",
       "goFonHardware","goFonPIN","goFonVoicemailPIN","telephoneNumber", "goFonMacro");
 
+$ACLD['nagiosAccount'] = array("NagiosAlias"
+, "NagiosPager"
+, "NagiosMail"
+, "HostNotificationPeriod"
+, "ServiceNotificationPeriod"
+, "HostNotificationCommands"
+, "ServiceNotificationCommands"
+, "HostNotificationOptions"
+, "ServiceNotificationOptions"
+, "AuthorizedAllHosts"
+, "AuthorizedAllServices"
+, "AuthorizedSystemCommands"
+, "AuthorizedAllHostCommands"
+, "AuthorizedAllServiceCommands"
+, "AuthorizedConfigurationInformation"
+, "AuthorizedSystemInformation");
+
 $ACLD['global-addressbook']=  array("create", "delete");
 ?>

diff --git a/plugins/personal/nagios/main.inc b/plugins/personal/nagios/main.inc
index 5ede10b2ecb9c0a70eb495588f356552f016bad2..f2a158f7bd8732a15e39f6969971dfd9eed75e68 100644 (file)
--- a/plugins/personal/nagios/main.inc
+++ b/plugins/personal/nagios/main.inc
@@ -57,10 +57,10 @@ if (!$remove_lock){
   /* Adjust acl's to mode */
   if (isset($_SESSION['edit'])){
     $acl= get_permissions ($ui->dn, $ui->subtreeACL);
-    $nagiosAccount->acl= get_module_permission($acl, "nagios", $ui->dn);
+    $nagiosAccount->acl= get_module_permission($acl, "nagiosAccount", $ui->dn);
   } else {
     $acl= get_permissions ($ui->dn, $ui->subtreeACL);
-    $editacl= get_module_permission($acl, "nagios", $ui->dn);
+    $editacl= get_module_permission($acl, "nagiosAccount", $ui->dn);
     $nagiosAccount->acl= "#none#";
   }