Commit b490fded authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge branch 'ldap_block_fix' of /home/git/repositories/gitlab/gitlabhq into 6-2-stable

parents 675e5203 e4e96f2d
...@@ -78,7 +78,7 @@ module Gitlab ...@@ -78,7 +78,7 @@ module Gitlab
# * when ldap account was deactivated by change of OU membership in 'dn' # * when ldap account was deactivated by change of OU membership in 'dn'
def blocked?(dn) def blocked?(dn)
ldap = OmniAuth::LDAP::Adaptor.new(ldap_conf) ldap = OmniAuth::LDAP::Adaptor.new(ldap_conf)
ldap.connection.search(base: dn, size: 1).blank? ldap.connection.search(base: dn, scope: Net::LDAP::SearchScope_BaseObject, size: 1).blank?
end end
private private
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment