From 9bb95e915e70b8106a8459421bfa7f35442c35a1 Mon Sep 17 00:00:00 2001
From: alena <alena@cloud.com>
Date: Thu, 15 Sep 2011 10:01:47 -0700
Subject: [PATCH] bug 11447: don't do security group check if both groups
 belong to the same domain status 11447: resolved fixed

---
 .../com/cloud/network/security/SecurityGroupManagerImpl.java  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/server/src/com/cloud/network/security/SecurityGroupManagerImpl.java b/server/src/com/cloud/network/security/SecurityGroupManagerImpl.java
index 1aa6981bb0b..2887774a976 100755
--- a/server/src/com/cloud/network/security/SecurityGroupManagerImpl.java
+++ b/server/src/com/cloud/network/security/SecurityGroupManagerImpl.java
@@ -624,7 +624,9 @@ public class SecurityGroupManagerImpl implements SecurityGroupManager, SecurityG
                 }
 
                 // Check permissions
-                _accountMgr.checkAccess(caller, null, groupVO);
+                if (domainId != groupVO.getDomainId()) {
+                    throw new PermissionDeniedException("Can't add security group id=" + groupVO.getDomainId() + " as it belongs to different domain");
+                }
 
                 authorizedGroups.add(groupVO);
             }