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

Dmitriy Zaporozhets
2 parents 675e5203 e4e96f2d
Showing 1 changed file with 1 additions and 1 deletions Show diff stats
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
...	...	@@ -78,7 +78,7 @@ module Gitlab
78	78	# * when ldap account was deactivated by change of OU membership in 'dn'
79	79	def blocked?(dn)
80	80	ldap = OmniAuth::LDAP::Adaptor.new(ldap_conf)
81		- ldap.connection.search(base: dn, size: 1).blank?
	81	+ ldap.connection.search(base: dn, scope: Net::LDAP::SearchScope_BaseObject, size: 1).blank?
82	82	end
83	83
84	84	private
...	...