From def8fa4490fe19dfd1039be5dbd56173f933b82b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= <cmartin@opennebula.org>
Date: Wed, 19 Feb 2014 15:48:36 +0100
Subject: [PATCH] Feature #2565: Make all zones visible by default to all users

---
 src/acl/AclManager.cc         |  8 ++++++++
 src/rm/RequestManagerGroup.cc | 30 ------------------------------
 2 files changed, 8 insertions(+), 30 deletions(-)

diff --git a/src/acl/AclManager.cc b/src/acl/AclManager.cc
index 04c7cfcbed..fd408d29d8 100644
--- a/src/acl/AclManager.cc
+++ b/src/acl/AclManager.cc
@@ -114,6 +114,14 @@ AclManager::AclManager(
                  AclRule::INDIVIDUAL_ID |
                      zone_id,
                  error_str);
+
+        // @<gid> ZONE/#<zone> USE *
+        add_rule(AclRule::ALL_ID,
+                 AclRule::ALL_ID |
+                    PoolObjectSQL::ZONE,
+                 AuthRequest::USE,
+                 AclRule::ALL_ID,
+                 error_str);
     }
 }
 
diff --git a/src/rm/RequestManagerGroup.cc b/src/rm/RequestManagerGroup.cc
index 785c3d1d6b..0dc58dea44 100644
--- a/src/rm/RequestManagerGroup.cc
+++ b/src/rm/RequestManagerGroup.cc
@@ -261,21 +261,6 @@ int GroupAddProvider::edit_acl_rules(
 
             error_msg);
 
-    // @<gid> ZONE/#<zone> USE *
-    rc += aclm->add_rule(
-            AclRule::GROUP_ID |
-            group_id,
-
-            PoolObjectSQL::ZONE |
-            AclRule::INDIVIDUAL_ID |
-            zone_id,
-
-            AuthRequest::USE,
-
-            AclRule::ALL_ID,
-
-            error_msg);
-
     if (rc != 0)
     {
         return -1;
@@ -343,21 +328,6 @@ int GroupDelProvider::edit_acl_rules(
 
             error_msg);
 
-    // @<gid> ZONE/#<zone> USE *
-    rc += aclm->del_rule(
-            AclRule::GROUP_ID |
-            group_id,
-
-            PoolObjectSQL::ZONE |
-            AclRule::INDIVIDUAL_ID |
-            zone_id,
-
-            AuthRequest::USE,
-
-            AclRule::ALL_ID,
-
-            error_msg);
-
     if (rc != 0)
     {
         return -1;