cloudstack/plugins/user-authenticators
Rajani Karuturi 69e550f5ea Fixed CLOUDSTACK-6509 Cannot import multiple LDAP/AD users into a cloudstack account
Conflicts:
	api/src/com/cloud/user/AccountService.java
	plugins/user-authenticators/ldap/src/org/apache/cloudstack/api/command/LdapCreateAccountCmd.java
	plugins/user-authenticators/ldap/src/org/apache/cloudstack/api/command/LdapImportUsersCmd.java

Signed-off-by: Koushik Das <koushik@apache.org>
2014-04-29 13:37:28 +02:00
..
ldap Fixed CLOUDSTACK-6509 Cannot import multiple LDAP/AD users into a cloudstack account 2014-04-29 13:37:28 +02:00
md5 Changed "authenticate" method to return both - result of authentication, and action to perform when authentication failed - to the accountManagerImpl. Only if authenicators request INCREMENT_INCORRECT_LOGIN_ATTEMPT_COUNT, the incorrect_login_attempts parameter will be increased 2014-01-21 17:45:53 -08:00
plain-text Changed "authenticate" method to return both - result of authentication, and action to perform when authentication failed - to the accountManagerImpl. Only if authenicators request INCREMENT_INCORRECT_LOGIN_ATTEMPT_COUNT, the incorrect_login_attempts parameter will be increased 2014-01-21 17:45:53 -08:00
sha256salted Fixed unittest 2014-01-21 20:05:16 -08:00