From 437d30a295ee482f97e3c6f45227970b107af72b Mon Sep 17 00:00:00 2001 From: Marcus Sorensen Date: Wed, 30 Jan 2013 16:33:12 -0700 Subject: [PATCH] Summary: allow admin user to do whatever he wants Reported-by: Ryan Dietrich Signed-off-by: Marcus Sorensen 1359588792 -0700 --- server/src/com/cloud/vm/UserVmManagerImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server/src/com/cloud/vm/UserVmManagerImpl.java b/server/src/com/cloud/vm/UserVmManagerImpl.java index fd3fffd85ca..82a8e25c5a6 100644 --- a/server/src/com/cloud/vm/UserVmManagerImpl.java +++ b/server/src/com/cloud/vm/UserVmManagerImpl.java @@ -954,7 +954,7 @@ public class UserVmManagerImpl implements UserVmManager, UserVmService, Manager if (network.getGuestType() != Network.GuestType.Shared) { // Check account permissions List networkMap = _networkDao.listBy(caller.getId(), network.getId()); - if (networkMap == null || networkMap.isEmpty()) { + if ((networkMap == null || networkMap.isEmpty() ) && caller.getType() != Account.ACCOUNT_TYPE_ADMIN) { throw new PermissionDeniedException("Unable to modify a vm using network with id " + network.getId() + ", permission denied"); } } @@ -1031,7 +1031,7 @@ public class UserVmManagerImpl implements UserVmManager, UserVmService, Manager if (network.getGuestType() != Network.GuestType.Shared) { // Check account permissions List networkMap = _networkDao.listBy(caller.getId(), network.getId()); - if (networkMap == null || networkMap.isEmpty()) { + if ((networkMap == null || networkMap.isEmpty() ) && caller.getType() != Account.ACCOUNT_TYPE_ADMIN) { throw new PermissionDeniedException("Unable to modify a vm using network with id " + network.getId() + ", permission denied"); } }