cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From prachida...@apache.org
Subject git commit: updated refs/heads/4.4 to 2cf4db5
Date Wed, 16 Apr 2014 00:30:12 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/4.4 d81438326 -> 2cf4db535


CLOUDSTACK-6349: IAM - No error message presented to the user , when invalid password is provided.

- AccountManager now works using accountId instead of accountType


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/2cf4db53
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/2cf4db53
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/2cf4db53

Branch: refs/heads/4.4
Commit: 2cf4db5359fa6741beb7eed4a8b33b351a9a4634
Parents: d814383
Author: Prachi Damle <prachi@cloud.com>
Authored: Tue Apr 15 17:25:56 2014 -0700
Committer: Prachi Damle <prachi@cloud.com>
Committed: Tue Apr 15 17:26:26 2014 -0700

----------------------------------------------------------------------
 server/src/com/cloud/user/AccountManagerImpl.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2cf4db53/server/src/com/cloud/user/AccountManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/user/AccountManagerImpl.java b/server/src/com/cloud/user/AccountManagerImpl.java
index 0d4b72d..d22687e 100755
--- a/server/src/com/cloud/user/AccountManagerImpl.java
+++ b/server/src/com/cloud/user/AccountManagerImpl.java
@@ -2042,7 +2042,7 @@ public class AccountManagerImpl extends ManagerBase implements AccountManager,
M
             UserAccount userAccount = _userAccountDao.getUserAccount(username, domainId);
             if (userAccount != null) {
                 if (userAccount.getState().equalsIgnoreCase(Account.State.enabled.toString()))
{
-                    if (!isInternalAccount(userAccount.getType())) {
+                    if (!isInternalAccount(userAccount.getId())) {
                         // Internal accounts are not disabled
                         int attemptsMade = userAccount.getLoginAttempts() + 1;
                         if (updateIncorrectLoginCount) {


Mime
View raw message