cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mc...@apache.org
Subject git commit: updated refs/heads/rbac to 13e25d2
Date Wed, 19 Feb 2014 19:35:52 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/rbac 26e92af62 -> 13e25d2aa


Fixed a bug in constructing search parameters with accountName passed.

Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/13e25d2a
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/13e25d2a
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/13e25d2a

Branch: refs/heads/rbac
Commit: 13e25d2aae1c3ec48a6c770e5b20e05c17742db2
Parents: 26e92af
Author: Min Chen <min.chen@citrix.com>
Authored: Wed Feb 19 11:35:00 2014 -0800
Committer: Min Chen <min.chen@citrix.com>
Committed: Wed Feb 19 11:35:00 2014 -0800

----------------------------------------------------------------------
 server/src/com/cloud/user/AccountManagerImpl.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/13e25d2a/server/src/com/cloud/user/AccountManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/user/AccountManagerImpl.java b/server/src/com/cloud/user/AccountManagerImpl.java
index 8509114..8f4d3ab 100755
--- a/server/src/com/cloud/user/AccountManagerImpl.java
+++ b/server/src/com/cloud/user/AccountManagerImpl.java
@@ -2295,8 +2295,8 @@ public class AccountManagerImpl extends ManagerBase implements AccountManager,
M
                 List<Long> grantedAccounts = qs.getAuthorizedAccounts(caller, action);
                 List<Long> grantedResources = qs.getAuthorizedResources(caller, action);
 
-                if (domainId != null) {
-                    // specific domain is specified
+                if (permittedAccounts.isEmpty() && domainId != null) {
+                    // specific domain and no account is specified
                     if (grantedDomains.contains(domainId)) {
                         permittedDomains.add(domainId);
                     } else {


Mime
View raw message