Merge pull request #5400 from lokedhs/master

When looking up a user by DN, use single scope

Merge pull request #5400 from lokedhs/master
186e8ad9 · Jacob Vosmaer · 5b091c76 · bc8a875d · 186e8ad9
Commit 186e8ad9 authored Nov 04, 2013 by Jacob Vosmaer
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

user.rb lib/gitlab/ldap/user.rb +1 -1

No files found.
--- 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