apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-11-02 20:02:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed the issue when admin can't deploy vm in behalf of another user. We were passing caller to deployVm always.

Browse Source
This commit is contained in:
alena 2011-03-14 11:08:59 -07:00
parent 402f275a9f
commit 7b9b897459
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
server/src/com/cloud/vm/UserVmManagerImpl.java
View File

@ -1902,7 +1902,7 @@ public class UserVmManagerImpl implements UserVmManager, UserVmService, Manager
networkList.add(defaultNetwork); networkList.add(defaultNetwork);
} }
return createVirtualMachine(zone, serviceOffering, template, hostName, displayName, caller, diskOfferingId, return createVirtualMachine(zone, serviceOffering, template, hostName, displayName, owner, diskOfferingId,
diskSize, networkList, securityGroupIdList, group, userData, sshKeyPair, hypervisor, caller); diskSize, networkList, securityGroupIdList, group, userData, sshKeyPair, hypervisor, caller);
} }
@ -2049,7 +2049,7 @@ public class UserVmManagerImpl implements UserVmManager, UserVmService, Manager
} }
return createVirtualMachine(zone, serviceOffering, template, hostName, displayName, caller, diskOfferingId, return createVirtualMachine(zone, serviceOffering, template, hostName, displayName, owner, diskOfferingId,
diskSize, networkList, null, group, userData, sshKeyPair, hypervisor, caller); diskSize, networkList, null, group, userData, sshKeyPair, hypervisor, caller);
} }
@ -2069,7 +2069,7 @@ public class UserVmManagerImpl implements UserVmManager, UserVmService, Manager
throw new CloudRuntimeException("Unable to find the domain " + zone.getDomainId() + " for the zone: " + zone); throw new CloudRuntimeException("Unable to find the domain " + zone.getDomainId() + " for the zone: " + zone);
} }
_accountMgr.checkAccess(caller, domain); _accountMgr.checkAccess(caller, domain);
_accountMgr.checkAccess(owner, domain); _accountMgr.checkAccess(caller, domain);
} }
//check if account/domain is with in resource limits to create a new vm //check if account/domain is with in resource limits to create a new vm