Nemcio/Redmine
1
0
Fork 0
mirror of https://github.com/redmine/redmine.git synced 2025-11-09 14:56:01 +01:00
Code Issues Packages Projects Releases Activity

revert r16322 (#24970)

Browse Source 
Some tests fail.

git-svn-id: http://svn.redmine.org/redmine/trunk@16323 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Toshi MARUYAMA
2017-02-02 03:01:19 +00:00
parent d37125dfe9
commit 5a86f95d29
5 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/models/auth_source_ldap.rb
View File

@@ -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