From a3d90ce88f13f5a57fa5db695f87ba1bb3f10640 Mon Sep 17 00:00:00 2001 From: "Ruben S. Montero" Date: Thu, 20 Nov 2014 15:30:23 +0100 Subject: [PATCH 1/2] feature #3175: Remove duplicated sgs when the VNET is inserted --- src/vnm/VirtualNetwork.cc | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/vnm/VirtualNetwork.cc b/src/vnm/VirtualNetwork.cc index aa2b43fb30..02809d68ae 100644 --- a/src/vnm/VirtualNetwork.cc +++ b/src/vnm/VirtualNetwork.cc @@ -211,7 +211,13 @@ int VirtualNetwork::insert(SqlDB * db, string& error_str) } else { + set sgs; + sg_str.append(",0"); + + one_util::split_unique(sg_str, ',', sgs); + + sg_str = one_util::join(sgs.begin(), sgs.end(), ','); } add_template_attribute("SECURITY_GROUPS", sg_str); From aaba12f72b841319aa5909841a8b5d666a1bf7e7 Mon Sep 17 00:00:00 2001 From: "Ruben S. Montero" Date: Thu, 20 Nov 2014 15:34:38 +0100 Subject: [PATCH 2/2] feature #3175: Group Users can create Security Groups --- src/acl/AclManager.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/acl/AclManager.cc b/src/acl/AclManager.cc index 08fe240f4f..ca6752b029 100644 --- a/src/acl/AclManager.cc +++ b/src/acl/AclManager.cc @@ -91,7 +91,8 @@ AclManager::AclManager( PoolObjectSQL::NET | PoolObjectSQL::IMAGE | PoolObjectSQL::TEMPLATE | - PoolObjectSQL::DOCUMENT, + PoolObjectSQL::DOCUMENT | + PoolObjectSQL::SECGROUP, AuthRequest::CREATE, AclRule::INDIVIDUAL_ID | zone_id,