From ad5341d0d3047d87c58d470dafa7b196b2186d09 Mon Sep 17 00:00:00 2001
From: Abhinandan Prateek <aprateek@cloud.com>
Date: Wed, 2 Nov 2011 13:30:15 +0530
Subject: [PATCH] bug 11804: Only root admins have a relaxed resource limit now

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

diff --git a/server/src/com/cloud/user/AccountManagerImpl.java b/server/src/com/cloud/user/AccountManagerImpl.java
index 5d88b4130da..d2a50b86ddc 100755
--- a/server/src/com/cloud/user/AccountManagerImpl.java
+++ b/server/src/com/cloud/user/AccountManagerImpl.java
@@ -353,8 +353,8 @@ public class AccountManagerImpl implements AccountManager, AccountService, Manag
     public boolean resourceLimitExceeded(Account account, ResourceType type, long... count) {
         long numResources = ((count.length == 0) ? 1 : count[0]);
 
-        // Don't place any limits on system or admin accounts
-        if (isAdmin(account.getType())) {
+        // Don't place any limits on system or admin accounts for ROOT domain only
+        if (isAdmin(account.getType()) && account.getDomainId() == 1) {
             return false;
         }