Updated rSyslog ACLs - works but there is still a little glitch

-Can still see all systems with only having acl to server/rSyslogServer

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

diff --git a/gosa-core/contrib/gosa.conf b/gosa-core/contrib/gosa.conf
index 9226d84830bc904b97cf9f1c32bf4c9dd7d1ef47..a57f6c5c3bf8d2f76451983d85e11a10b6e2ce8c 100644 (file)
--- a/gosa-core/contrib/gosa.conf
+++ b/gosa-core/contrib/gosa.conf
@@ -72,7 +72,7 @@
 
     <!-- Section to enable addon plugins -->
     <section name="Addons">
-      <plugin acl="rsyslog"  class="rsyslog" />
+      <plugin acl="server/rSyslogServer" class="rsyslog" />
     <!--  <plugin acl="server/servservrepository,server/dakrepository,server/dakkeyring,server/dakqueue" class="dak_tabs" path="plugins/addons/dak" /> -->
       <plugin acl="addressbook" class="addressbook" />
       <plugin acl="mailqueue" class="mailqueue" />

diff --git a/gosa-plugins/rsyslog/addons/rsyslog/class_rsyslog.inc b/gosa-plugins/rsyslog/addons/rsyslog/class_rsyslog.inc
index 6d469d22292539c4547976eaf9839d218318f386..134746296373f886fe28361fbdbfc5a4e4152b91 100644 (file)
--- a/gosa-plugins/rsyslog/addons/rsyslog/class_rsyslog.inc
+++ b/gosa-plugins/rsyslog/addons/rsyslog/class_rsyslog.inc
@@ -69,7 +69,7 @@ class rsyslog extends plugin
         $this->servers[$name]['error']  = "";
 
         // Detect ACLs
-        $this->servers[$name]['ACL'] =  $ui->get_permissions($server['dn'], 'server/rsyslog','viewEntries');
+        $this->servers[$name]['ACL'] =  $ui->get_permissions($server['dn'], 'server/rSyslogServer','viewEntries');
 
         // Get list of Hosts using this log server..
         if(preg_match('/r/', $this->servers[$name]['ACL'])){

diff --git a/gosa-plugins/rsyslog/admin/systems/services/rsyslog/class_rSyslogServer.inc b/gosa-plugins/rsyslog/admin/systems/services/rsyslog/class_rSyslogServer.inc
index a69b21f8ebbe1f6f885866573385717b67d38db9..282dc357c09d3b0bec06ea521154b4b481778971 100644 (file)
--- a/gosa-plugins/rsyslog/admin/systems/services/rsyslog/class_rSyslogServer.inc
+++ b/gosa-plugins/rsyslog/admin/systems/services/rsyslog/class_rSyslogServer.inc
@@ -27,7 +27,8 @@ class rSyslogServer extends goService{
   {
     goService::goService($config,$dn);
     $this->DisplayName = _("Logging");
-    $this->initial_use_database = $this->use_database = isset($this->attrs['objectClass']) &&in_array("goLogDBServer", $this->attrs['objectClass']);
+    $this->initial_use_database = $this->use_database = 
+      isset($this->attrs['objectClass']) &&in_array("goLogDBServer", $this->attrs['objectClass']);
 
     if($this->use_database){
       foreach($this->db_attributes as $attr){