diff options
| author | Toshi MARUYAMA <marutosijp2@yahoo.co.jp> | 2017-02-02 03:01:19 +0000 |
|---|---|---|
| committer | Toshi MARUYAMA <marutosijp2@yahoo.co.jp> | 2017-02-02 03:01:19 +0000 |
| commit | 5a86f95d290a35274ca944c160e44d56b3a3430c (patch) | |
| tree | 115111b3cf9ca7061242b995da49821f478f14b6 /app/models | |
| parent | d37125dfe98b295cb8dd15d7c12ed2c97a122e8d (diff) | |
| download | redmine-5a86f95d290a35274ca944c160e44d56b3a3430c.tar.gz redmine-5a86f95d290a35274ca944c160e44d56b3a3430c.zip | |
revert r16322 (#24970)
Some tests fail.
git-svn-id: http://svn.redmine.org/redmine/trunk@16323 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 1301e326c..d2aa25212 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::Error, + Net::LDAP::LdapError, 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::Error, Net::LDAP::FilterSyntaxInvalidError + rescue Net::LDAP::LdapError, Net::LDAP::FilterSyntaxInvalidError nil end |