From 3f1abbcbc83b70ba0c86c9b4bb45713ff3b22880 Mon Sep 17 00:00:00 2001 From: alena Date: Mon, 22 Nov 2010 17:04:32 -0800 Subject: [PATCH] Fixed assignToLoadBalancer command - admin couldn't assing LB rule in behalf of other user --- server/src/com/cloud/network/NetworkManagerImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server/src/com/cloud/network/NetworkManagerImpl.java b/server/src/com/cloud/network/NetworkManagerImpl.java index ca46ff12f3b..563d8d718c5 100755 --- a/server/src/com/cloud/network/NetworkManagerImpl.java +++ b/server/src/com/cloud/network/NetworkManagerImpl.java @@ -1173,11 +1173,11 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag // Permission check... Account account = UserContext.current().getAccount(); if (account != null) { - if ((account.getType() == Account.ACCOUNT_TYPE_DOMAIN_ADMIN) || (account.getType() == Account.ACCOUNT_TYPE_READ_ONLY_ADMIN)) { + if (account.getType() == Account.ACCOUNT_TYPE_DOMAIN_ADMIN) { if (!_domainDao.isChildDomain(account.getDomainId(), loadBalancer.getDomainId())) { throw new PermissionDeniedException("Failed to assign to load balancer " + loadBalancerId + ", permission denied."); } - } else if (account.getId() != loadBalancer.getAccountId()) { + } else if (account.getType() != Account.ACCOUNT_TYPE_ADMIN && account.getId() != loadBalancer.getAccountId()) { throw new PermissionDeniedException("Failed to assign to load balancer " + loadBalancerId + ", permission denied."); } }