From da7b29738e85b33366f21a89249257c64989a071 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= <cmartin@opennebula.org>
Date: Fri, 12 Dec 2014 17:21:55 +0100
Subject: [PATCH] Bug #3381: Change default group acl rule to match the one for
 new groups

(cherry picked from commit b09e87314f0d0ffb9d29e0b798a9fa6377b0f875)
---
 src/acl/AclManager.cc | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/acl/AclManager.cc b/src/acl/AclManager.cc
index ca6752b029..a02bf46d5c 100644
--- a/src/acl/AclManager.cc
+++ b/src/acl/AclManager.cc
@@ -83,19 +83,17 @@ AclManager::AclManager(
         string error_str;
 
         // Users in group USERS can create standard resources
-        // @1 VM+NET+IMAGE+TEMPLATE+DOCUMENT/* CREATE #<local-zone>
+        // @1 VM+IMAGE+TEMPLATE+DOCUMENT/* CREATE *
         add_rule(AclRule::GROUP_ID |
                     1,
                  AclRule::ALL_ID |
                     PoolObjectSQL::VM |
-                    PoolObjectSQL::NET |
                     PoolObjectSQL::IMAGE |
                     PoolObjectSQL::TEMPLATE |
                     PoolObjectSQL::DOCUMENT |
                     PoolObjectSQL::SECGROUP,
                  AuthRequest::CREATE,
-                 AclRule::INDIVIDUAL_ID |
-                     zone_id,
+                 AclRule::ALL_ID,
                  error_str);
 
         // * ZONE/* USE *