summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Gemfile2
-rw-r--r--app/models/auth_source_ldap.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/Gemfile b/Gemfile
index aa3f2019a..259ab6aca 100644
--- 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 02ef3b42a..6fb43d44a 100644
--- 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