diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/devise/ldap_authenticatable.rb | 3 | ||||
| -rw-r--r-- | lib/mastodon/version.rb | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/lib/devise/ldap_authenticatable.rb b/lib/devise/ldap_authenticatable.rb index 534c7a851..6903d468d 100644 --- a/lib/devise/ldap_authenticatable.rb +++ b/lib/devise/ldap_authenticatable.rb @@ -25,11 +25,12 @@ module Devise ) filter = format(Devise.ldap_search_filter, uid: Devise.ldap_uid, email: email) + if (user_info = ldap.bind_as(base: Devise.ldap_base, filter: filter, password: password)) user = User.ldap_get_user(user_info.first) success!(user) else - return fail(:invalid_login) + return fail(:invalid) end end end diff --git a/lib/mastodon/version.rb b/lib/mastodon/version.rb index d07108ad4..e4944ba67 100644 --- a/lib/mastodon/version.rb +++ b/lib/mastodon/version.rb @@ -21,7 +21,7 @@ module Mastodon end def flags - 'rc1' + 'rc2' end def to_a |