diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-11-05 19:47:40 +0400 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-11-05 19:47:40 +0400 |
| commit | b490fded3691615fa78ba6548a227fb663ce7d8e (patch) | |
| tree | 4227da9d382fb8b50b8088633b0aff885803d3fc | |
| parent | 675e5203cc00b6b6b5159bc798b593429869aa9b (diff) | |
| parent | e4e96f2deac4b2e0070a45e4c4c069e7e389009f (diff) | |
Merge branch 'ldap_block_fix' of /home/git/repositories/gitlab/gitlabhq into 6-2-stable
| -rw-r--r-- | lib/gitlab/ldap/user.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/ldap/user.rb b/lib/gitlab/ldap/user.rb index 78fc5dab9cb..3d57f3a2e35 100644 --- a/lib/gitlab/ldap/user.rb +++ b/lib/gitlab/ldap/user.rb @@ -78,7 +78,7 @@ module Gitlab # * when ldap account was deactivated by change of OU membership in 'dn' def blocked?(dn) 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 private |