upgrade net-ldap gem to 0.12.0 (#17618)

git-svn-id: http://svn.redmine.org/redmine/trunk@14784 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/Gemfile b/Gemfile
index aa3f2019a4fa23116feaa1fed04341186bf2c060..259ab6acaffda6971b2a1c20928f1da7f3afb8b0 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -21,7 +21,7 @@ gem "rbpdf", "~> 1.18.6"
 
 # Optional gem for LDAP authentication
 group :ldap do
-  gem "net-ldap", "~> 0.10.1"
+  gem "net-ldap", "~> 0.12.0"
 end
 
 # Optional gem for OpenID authentication

diff --git a/app/models/auth_source_ldap.rb b/app/models/auth_source_ldap.rb
index 02ef3b42abf9c6dcc0785c26ee97cc117bdec41a..6fb43d44a7f49cf30bb7a3676ac7a6454d52644f 100644 (file)
--- a/app/models/auth_source_ldap.rb
+++ b/app/models/auth_source_ldap.rb
@@ -105,7 +105,7 @@ class AuthSourceLdap < AuthSource
     if filter.present?
       Net::LDAP::Filter.construct(filter)
     end
-  rescue Net::LDAP::LdapError
+  rescue Net::LDAP::LdapError, Net::LDAP::FilterSyntaxInvalidError
     nil
   end