Repository: cloudstack Updated Branches: refs/heads/master ca907d8d0 -> 44ff7fea5
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/79716945 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/79716945 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/79716945 Branch: refs/heads/master Commit: 797169457bc145f4a8d18f8392a782393b495cdf Parents: ca907d8 Author: Prachi Damle <[email protected]> Authored: Tue Apr 15 17:25:56 2014 -0700 Committer: Min Chen <[email protected]> Committed: Mon Apr 28 11:09:12 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/79716945/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 c6131b9..c28ff7d 100755 --- a/server/src/com/cloud/user/AccountManagerImpl.java +++ b/server/src/com/cloud/user/AccountManagerImpl.java @@ -2035,7 +2035,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) {
