Backport Adapter#ldap_search from EE

This commit is contained in:
Jacob Vosmaer
2014-05-14 18:10:43 +02:00
parent f18f8e6755
commit f4bca105d1
+17 -1
View File
@@ -64,7 +64,7 @@ module Gitlab
end
end
entries = ldap.search(options).select do |entry|
entries = ldap_search(options).select do |entry|
entry.respond_to? config.uid
end
@@ -77,6 +77,22 @@ module Gitlab
users(*args).first
end
def ldap_search(*args)
results = ldap.search(*args)
if results.nil?
response = ldap.get_operation_result
unless response.code.zero?
Rails.logger.warn("LDAP search error: #{response.message}")
end
[]
else
results
end
end
private
def config