From a0eaf32cad6b1c1c62ba642f336d10a4d856a686 Mon Sep 17 00:00:00 2001
From: alena <alena@cloud.com>
Date: Thu, 18 Nov 2010 17:33:26 -0800
Subject: [PATCH] Fixed updateAccount command to work via 8096 port.

---
 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 e44e22f42e2..953908df346 100755
--- a/server/src/com/cloud/user/AccountManagerImpl.java
+++ b/server/src/com/cloud/user/AccountManagerImpl.java
@@ -1406,7 +1406,7 @@ public class AccountManagerImpl implements AccountManager, AccountService {
         
         //Check if user performing the action is allowed to modify this account
         Account adminAccount = UserContext.current().getAccount();
-        if ((adminAccount != null) && _domainDao.isChildDomain(adminAccount.getDomainId(), account.getDomainId())) {
+        if ((adminAccount != null) && (adminAccount.getType() != Account.ACCOUNT_TYPE_ADMIN) && _domainDao.isChildDomain(adminAccount.getDomainId(), account.getDomainId())) {
           throw new PermissionDeniedException("Invalid account " + accountName + " in domain " + domainId + " given, permission denied");
         }