diff options
| author | Toshi MARUYAMA <marutosijp2@yahoo.co.jp> | 2017-02-02 02:24:50 +0000 |
|---|---|---|
| committer | Toshi MARUYAMA <marutosijp2@yahoo.co.jp> | 2017-02-02 02:24:50 +0000 |
| commit | d37125dfe98b295cb8dd15d7c12ed2c97a122e8d (patch) | |
| tree | cf5bed1acd4852ca8a2ad299b102a6f74e612aae /app/models | |
| parent | fe906e4fb6b36b1d5e3c796cf0a256a427a8b228 (diff) | |
| download | redmine-d37125dfe98b295cb8dd15d7c12ed2c97a122e8d.tar.gz redmine-d37125dfe98b295cb8dd15d7c12ed2c97a122e8d.zip | |
replace depricated Net::LDAP::LdapError by Net::LDAP::Error (#24970)
git-svn-id: http://svn.redmine.org/redmine/trunk@16322 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/models')
| -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 d2aa25212..1301e326c 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 |