shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-21 14:50:08 +03:00
Code Releases Wiki Activity

Merge branch 'feature-3175' of git.opennebula.org:one into feature-3175

Browse Source
This commit is contained in:
Carlos Martín 2014-11-20 15:51:24 +01:00
commit 3d4154f949
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/acl/AclManager.cc
View File

@ -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,

6
src/vnm/VirtualNetwork.cc
View File

@ -211,7 +211,13 @@ int VirtualNetwork::insert(SqlDB * db, string& error_str)
}
else
{
set<int> 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);