diff --git a/lib/gitlab/ldap/adapter.rb b/lib/gitlab/ldap/adapter.rb index e81535267a..4a487529af 100644 --- a/lib/gitlab/ldap/adapter.rb +++ b/lib/gitlab/ldap/adapter.rb @@ -107,7 +107,12 @@ module Gitlab end def dn_matches_filter?(dn, filter) - ldap.search(base: dn, filter: filter, attributes: %w{dn}).any? + results = ldap.search(base: dn, filter: filter, attributes: %w{dn}) + if results.nil? + false # Net::LDAP encountered an LDAP error + else + results.any? + end end private