You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bh...@apache.org on 2015/06/12 13:54:30 UTC
git commit: updated refs/heads/4.5 to 979956a
Repository: cloudstack
Updated Branches:
refs/heads/4.5 64d72db0f -> 979956a4e
CLOUDSTACK-5409: Include projectid during ACL check while listing S2S Vpn gateways
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
This closes #374
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/979956a4
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/979956a4
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/979956a4
Branch: refs/heads/4.5
Commit: 979956a4effba0f6bb427d4d501dd643d1692f5e
Parents: 64d72db
Author: Kishan Kavala <ki...@apache.org>
Authored: Tue Jun 9 16:03:15 2015 +0530
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Fri Jun 12 14:54:16 2015 +0300
----------------------------------------------------------------------
server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/979956a4/server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java b/server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java
index a470ba1..bf4b8a3 100644
--- a/server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java
+++ b/server/src/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java
@@ -623,7 +623,7 @@ public class Site2SiteVpnManagerImpl extends ManagerBase implements Site2SiteVpn
Ternary<Long, Boolean, ListProjectResourcesCriteria> domainIdRecursiveListProject = new Ternary<Long, Boolean,
ListProjectResourcesCriteria>(domainId, isRecursive, null);
- _accountMgr.buildACLSearchParameters(caller, id, accountName, null, permittedAccounts, domainIdRecursiveListProject, listAll, false);
+ _accountMgr.buildACLSearchParameters(caller, id, accountName, cmd.getProjectId(), permittedAccounts, domainIdRecursiveListProject, listAll, false);
domainId = domainIdRecursiveListProject.first();
isRecursive = domainIdRecursiveListProject.second();
ListProjectResourcesCriteria listProjectResourcesCriteria = domainIdRecursiveListProject.third();