From 88d3f1ba03c8aa2a90c761a2eb53eefe6b95a686 Mon Sep 17 00:00:00 2001 From: Alena Prokharchyk Date: Wed, 25 Jan 2012 09:38:06 -0800 Subject: [PATCH] bug 13295: apply specific security check for the network status 13295: resolved fixed Reviewed-by: Will Chan --- server/src/com/cloud/user/AccountManagerImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/src/com/cloud/user/AccountManagerImpl.java b/server/src/com/cloud/user/AccountManagerImpl.java index ec7400f7fd9..ef6c5743c54 100755 --- a/server/src/com/cloud/user/AccountManagerImpl.java +++ b/server/src/com/cloud/user/AccountManagerImpl.java @@ -318,7 +318,7 @@ public class AccountManagerImpl implements AccountManager, AccountService, Manag Account account = ApiDBUtils.findAccountById(entity.getAccountId()); domainId = account != null ? account.getDomainId() : -1 ; } - if (entity.getAccountId() != -1 && domainId != -1 && !(entity instanceof VirtualMachineTemplate)) { + if (entity.getAccountId() != -1 && domainId != -1 && !(entity instanceof VirtualMachineTemplate) && !(accessType != null && accessType == AccessType.UseNetwork)) { List toBeChecked = domains.get(entity.getDomainId()); //for templates, we don't have to do cross domains check if (toBeChecked == null) {