diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2017-07-08 13:46:47 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2017-07-08 13:46:47 +0000 |
| commit | 2bc719e2c8deccaedc523ffa6ae2849321fc5cc3 (patch) | |
| tree | 16d765af721c77e8634973b68cfcbc6dbe97bc0e /app/models/auth_source_ldap.rb | |
| parent | 21e00bfdbf31e18d957127f64f62a841dab84925 (diff) | |
| download | redmine-2bc719e2c8deccaedc523ffa6ae2849321fc5cc3.tar.gz redmine-2bc719e2c8deccaedc523ffa6ae2849321fc5cc3.zip | |
LdapError is deprecated (#24970).
git-svn-id: http://svn.redmine.org/redmine/trunk@16773 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/models/auth_source_ldap.rb')
| -rw-r--r-- | app/models/auth_source_ldap.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/models/auth_source_ldap.rb b/app/models/auth_source_ldap.rb index c3565aa8f..8e380d456 100644 --- a/app/models/auth_source_ldap.rb +++ b/app/models/auth_source_ldap.rb @@ -21,7 +21,7 @@ require 'timeout' class AuthSourceLdap < AuthSource NETWORK_EXCEPTIONS = [ - Net::LDAP::LdapError, + Net::LDAP::Error, Errno::ECONNABORTED, Errno::ECONNREFUSED, Errno::ECONNRESET, Errno::EHOSTDOWN, Errno::EHOSTUNREACH, SocketError @@ -117,7 +117,7 @@ class AuthSourceLdap < AuthSource if filter.present? Net::LDAP::Filter.construct(filter) end - rescue Net::LDAP::LdapError, Net::LDAP::FilterSyntaxInvalidError + rescue Net::LDAP::Error, Net::LDAP::FilterSyntaxInvalidError nil end |